fix conflict
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
This commit is contained in:
parent
ccf2cdaab2
commit
be7d785f1d
|
@ -163,7 +163,6 @@ go.work
|
||||||
|
|
||||||
# User-specific stuff
|
# User-specific stuff
|
||||||
.idea/
|
.idea/
|
||||||
.idea
|
|
||||||
.idea/**/workspace.xml
|
.idea/**/workspace.xml
|
||||||
.idea/**/tasks.xml
|
.idea/**/tasks.xml
|
||||||
.idea/**/usage.statistics.xml
|
.idea/**/usage.statistics.xml
|
||||||
|
|
Loading…
Reference in New Issue