conflct

anatawa12 · Apr 11, 2024 · 45f1ae5 · 45f1ae5
1 parent b0030d1
commit 45f1ae5
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/packages/backend/migration/1695440131671-short-name.js b/packages/backend/migration/1695440131671-short-name.js
@@ -1,3 +1,5 @@
+// conflict
+
 export class ShortName1695440131671 {
     name = 'ShortName1695440131671'