merge code

This commit is contained in:
wangchuxiao 2022-02-14 10:57:23 +08:00
parent 22bfb6be4b
commit c413eda330
3 changed files with 1 additions and 8 deletions

1
.gitignore vendored
View File

@ -5,6 +5,7 @@ components
logs logs
out-test out-test
.github .github
.idea
deploy/open_im_demo deploy/open_im_demo
deploy/open_im_api deploy/open_im_api

2
.idea/.gitignore generated vendored
View File

@ -1,2 +0,0 @@
# Default ignored files
/workspace.xml

6
.idea/vcs.xml generated
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>