From 048b217d0ca7d458be69f31cf7eda2ee34172fb5 Mon Sep 17 00:00:00 2001
From: twwu <twwu@dify.ai>
Date: Wed, 11 Nov 2026 11:40:52 +0800
Subject: [PATCH] fix(migrations): merge draft and token heads

---
 ...o_draft_and_personal_access_token_heads.py | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 api/migrations/versions/2026_11_11_1140-e91a78f4c2b6_merge_loro_draft_and_personal_access_token_heads.py

diff --git a/api/migrations/versions/2026_11_11_1140-e91a78f4c2b6_merge_loro_draft_and_personal_access_token_heads.py b/api/migrations/versions/2026_11_11_1140-e91a78f4c2b6_merge_loro_draft_and_personal_access_token_heads.py
new file mode 100644
index 00000000000..46d0d053aeb
--- /dev/null
+++ b/api/migrations/versions/2026_11_11_1140-e91a78f4c2b6_merge_loro_draft_and_personal_access_token_heads.py
@@ -0,0 +1,21 @@
+"""Merge Loro draft and personal access token migration heads.
+
+Revision ID: e91a78f4c2b6
+Revises: b2e4c6d8a013, c6d2d8bc881f
+Create Date: 2026-11-11 11:40:00
+"""
+
+revision = "e91a78f4c2b6"
+down_revision = ("b2e4c6d8a013", "c6d2d8bc881f")
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    """Join both applied parent revisions without changing schema or data."""
+    pass
+
+
+def downgrade() -> None:
+    """Restore both parent heads without changing their schema or data."""
+    pass