From 3909e19eaa971fc2cc5fdfaadd82e3cc137649fd Mon Sep 17 00:00:00 2001
From: buzzcode2007 <73412182+buzz_lightsnack_2007@users.noreply.github.com>
Date: Sat, 23 Mar 2024 17:01:26 +0800
Subject: [PATCH] update the configuration

---
 .gitignore | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5ea81bf..1a3730c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 .DS_Store
 /bin
 interface.external.css
-<<<<<<< HEAD
 jquery.js
-=======
-jquery.css
->>>>>>> 8599ec1841a6f4c5cb99420496684d21f1126c1e
+/config/config.json