From c413eda330f30c025118c35688536bd61a02f4fe Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Mon, 14 Feb 2022 10:57:23 +0800
Subject: [PATCH] merge code

---
 .gitignore       | 1 +
 .idea/.gitignore | 2 --
 .idea/vcs.xml    | 6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
index 0947afd71..e4b74c4e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ components
 logs
 out-test
 .github
+.idea
 
 deploy/open_im_demo
 deploy/open_im_api
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 5c98b4288..000000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default ignored files
-/workspace.xml
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f4..000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -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>
\ No newline at end of file