fix conflict

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
pull/542/head
‘hanzhixiao’ 1 year ago
parent ccf2cdaab2
commit be7d785f1d

1
.gitignore vendored

@ -163,7 +163,6 @@ go.work
# User-specific stuff
.idea/
.idea
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml

Loading…
Cancel
Save