fix conflict

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
12 months ago · be7d785f1d
parent ccf2cdaab2
commit be7d785f1d
1 changed files with 0 additions and 1 deletions
--- 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