merge code

3 years ago · c413eda330
parent 22bfb6be4b
commit c413eda330
3 changed files with 1 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,6 +5,7 @@ components
 logs
 out-test
 .github
 .idea
 deploy/open_im_demo
 deploy/open_im_api
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@ -1,2 +0,0 @@
 # Default ignored files
 /workspace.xml
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -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>