From be7d785f1d84e15cddba25afe5408bdf0bbec37f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98hanzhixiao=E2=80=99?= <‘709674996@qq.com’>
Date: Thu, 13 Jul 2023 18:17:27 +0800
Subject: [PATCH] fix conflict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6edf18a05..e870d0a42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -163,7 +163,6 @@ go.work
 
 # User-specific stuff
 .idea/
-.idea
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/**/usage.statistics.xml