fix conflict

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
This commit is contained in:
‘hanzhixiao’ 2023-07-13 11:58:11 +08:00
parent 4684a428f5
commit df6a9a388f

3
.gitignore vendored
View File

@ -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