Merge pull request #3 from nobuoka/fix/gitignore-for-intellij-idea-wi…

…th-gradle-or-maven

Remove .idea/modules.xml file because it will be generated on import

.gitignore

@@ -15,7 +15,6 @@
 
 ### IntelliJ IDEA ###
 *.iws
-*.iml
 *.ipr
 /out/
 
@@ -26,7 +25,7 @@
 /nbdist/
 /.nb-gradle/
 
-# https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore のコピペ
+# https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore をベースとして変更したもの
 
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
@@ -51,17 +50,12 @@
 .idea/**/uiDesigner.xml
 .idea/**/dbnavigator.xml
 
-# Gradle
+# IntelliJ IDEA with Gradle or Maven
+# See : https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems
 .idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
+.idea/libraries/
+.idea/modules.xml
+*.iml
 
 # CMake
 cmake-build-*/