fix conflict

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
This commit is contained in:
‘hanzhixiao’ 2023-07-13 18:17:27 +08:00 committed by Xinwei Xiong(cubxxw-openim)
parent 96fb0af010
commit 9dc7e3433d

1
.gitignore vendored
View File

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