fix(conflicts): fix conflicts

Sg312 · Sg312 · commit 5488b47a6b66 · 2026-07-08T15:52:44.000-07:00
diff --git a/packages/db/migrations/meta/0257_snapshot.json b/packages/db/migrations/meta/0257_snapshot.json
@@ -1,9 +1,5 @@
 {
-<<<<<<< HEAD
   "id": "c405fc48-c6bb-4786-863f-3d3e686095b5",
-=======
-  "id": "554b063d-95f6-424c-bb2f-bc752b1060a8",
->>>>>>> bbc79edfc8 (feat(fork-chat): add fork chat to mothership)
   "prevId": "b932608c-c10f-4085-8f59-0621b23071f4",
   "version": "7",
   "dialect": "postgresql",
diff --git a/packages/db/migrations/meta/_journal.json b/packages/db/migrations/meta/_journal.json
@@ -1793,21 +1793,13 @@
       "when": 1783392614134,
       "tag": "0256_custom_block_inputs",
       "breakpoints": true
-<<<<<<< HEAD
     },
     {
       "idx": 257,
       "version": "7",
-<<<<<<< HEAD
       "when": 1783531236677,
       "tag": "0257_majestic_chat",
-=======
-      "when": 1783532515066,
-      "tag": "0257_workspace_files_message_id",
->>>>>>> bbc79edfc8 (feat(fork-chat): add fork chat to mothership)
       "breakpoints": true
-=======
->>>>>>> 1bd7722eb8 (fix(conflicts): remove migration)
     }
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -1793,21 +1793,13 @@`
`1793`	`1793`	`"when": 1783392614134,`
`1794`	`1794`	`"tag": "0256_custom_block_inputs",`
`1795`	`1795`	`"breakpoints": true`
`1796`		`-<<<<<<< HEAD`
`1797`	`1796`	`},`
`1798`	`1797`	`{`
`1799`	`1798`	`"idx": 257,`
`1800`	`1799`	`"version": "7",`
`1801`		`-<<<<<<< HEAD`
`1802`	`1800`	`"when": 1783531236677,`
`1803`	`1801`	`"tag": "0257_majestic_chat",`
`1804`		`-=======`
`1805`		`- "when": 1783532515066,`
`1806`		`- "tag": "0257_workspace_files_message_id",`
`1807`		`->>>>>>> bbc79edfc8 (feat(fork-chat): add fork chat to mothership)`
`1808`	`1802`	`"breakpoints": true`
`1809`		`-=======`
`1810`		`->>>>>>> 1bd7722eb8 (fix(conflicts): remove migration)`
`1811`	`1803`	`}`
`1812`	`1804`	`]`
`1813`	`1805`	`}`