simstudioai
diff --git a/‎packages/db/migrations/0257_workspace_files_message_id.sql‎
Lines changed: 0 additions & 1 deletion b/‎packages/db/migrations/0257_workspace_files_message_id.sql‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎packages/db/migrations/meta/_journal.json‎
Lines changed: 3 additions & 0 deletions b/‎packages/db/migrations/meta/_journal.json‎
Lines changed: 3 additions & 0 deletions
@@ -1793,6 +1793,7 @@
       "when": 1783392614134,
       "tag": "0256_custom_block_inputs",
       "breakpoints": true
+<<<<<<< HEAD
     },
     {
       "idx": 257,
@@ -1805,6 +1806,8 @@
       "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,6 +1793,7 @@`
`1793`	`1793`	`"when": 1783392614134,`
`1794`	`1794`	`"tag": "0256_custom_block_inputs",`
`1795`	`1795`	`"breakpoints": true`
	`1796`	`+<<<<<<< HEAD`
`1796`	`1797`	`},`
`1797`	`1798`	`{`
`1798`	`1799`	`"idx": 257,`
`@@ -1805,6 +1806,8 @@`
`1805`	`1806`	`"tag": "0257_workspace_files_message_id",`
`1806`	`1807`	`>>>>>>> bbc79edfc8 (feat(fork-chat): add fork chat to mothership)`
`1807`	`1808`	`"breakpoints": true`
	`1809`	`+=======`
	`1810`	`+>>>>>>> 1bd7722eb8 (fix(conflicts): remove migration)`
`1808`	`1811`	`}`
`1809`	`1812`	`]`
`1810`	`1813`	`}`