Merge pull request diliuzuzhanghao#16 from yangsongbao/master

ignore .idea
Pxshuo163 · Feb 27, 2017 · f562ec9 · f562ec9
2 parents 69762a0 + 96b7795
commit f562ec9
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 1,203 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,8 @@ hs_err_pid*
 #ide config
 .metadata
 .recommenders
+.idea/
+
 
 
 #macOS

diff --git a/.idea/coding2017.iml b/.idea/coding2017.iml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,8 @@ hs_err_pid* @@
     #ide config
     .metadata
     .recommenders
+    .idea/
     #macOS
@@ Expand Down @@