mirror of
https://github.com/openimsdk/open-im-server.git
synced 2026-01-12 08:27:03 +08:00
fix conflict
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
This commit is contained in:
parent
4684a428f5
commit
df6a9a388f
3
.gitignore
vendored
3
.gitignore
vendored
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user