From 45f1ae551b773d226f2519727179c7e077fee235 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Fri, 12 Apr 2024 03:46:08 +0900
Subject: [PATCH] conflct

---
 packages/backend/migration/1695440131671-short-name.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/backend/migration/1695440131671-short-name.js b/packages/backend/migration/1695440131671-short-name.js
index 2c37297fc109..62a991c1ed70 100644
--- 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'