fix conflict

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
2 years ago · df6a9a388f
parent 4684a428f5
commit df6a9a388f
1 changed files with 3 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -162,6 +162,9 @@ go.work
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

 # User-specific stuff
+
+.idea/
+
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/**/usage.statistics.xml