From 2027424146dd08f9966578431b3256fe391de400 Mon Sep 17 00:00:00 2001
From: aidenlu <aiden_lu@wochacha.com>
Date: Wed, 15 May 2024 11:14:59 +0800
Subject: [PATCH] fix: fix conflicts

---
 src-tauri/tauri.conf.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 55b6a821fe8..aa7716cc22b 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -112,4 +112,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}