From 03b2697d79fe2c278d9f2f56fe11a065839cff0a Mon Sep 17 00:00:00 2001
From: JOLY AMAURY p1910892 <amaury.joly@etu.univ-lyon1.fr>
Date: Wed, 25 Nov 2020 12:33:01 +0100
Subject: [PATCH] Update .gitignore

---
 .gitignore | 46 ++++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 99ce902..9f6ecdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 
-# Created by https://www.toptal.com/developers/gitignore/api/intellij,netbeans,java
-# Edit at https://www.toptal.com/developers/gitignore?templates=intellij,netbeans,java
+# Created by https://www.toptal.com/developers/gitignore/api/intellij+all,netbeans,java
+# Edit at https://www.toptal.com/developers/gitignore?templates=intellij+all,netbeans,java
 
-### Intellij ###
+### Intellij+all ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
@@ -75,35 +75,21 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
-### Intellij Patch ###
-# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+### Intellij+all Patch ###
+# Ignores the whole .idea folder and all .iml files
+# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
 
-# *.iml
-# modules.xml
-# .idea/misc.xml
-# *.ipr
+.idea/
+
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+*.iml
+modules.xml
+.idea/misc.xml
+*.ipr
 
 # Sonarlint plugin
-# https://plugins.jetbrains.com/plugin/7973-sonarlint
-.idea/**/sonarlint/
-
-# SonarQube Plugin
-# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
-.idea/**/sonarIssues.xml
-
-# Markdown Navigator plugin
-# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
-.idea/**/markdown-navigator.xml
-.idea/**/markdown-navigator-enh.xml
-.idea/**/markdown-navigator/
-
-# Cache file creation bug
-# See https://youtrack.jetbrains.com/issue/JBR-2257
-.idea/$CACHE_FILE$
-
-# CodeStream plugin
-# https://plugins.jetbrains.com/plugin/12206-codestream
-.idea/codestream.xml
+.idea/sonarlint
 
 ### Java ###
 # Compiled class file
@@ -140,4 +126,4 @@ dist/
 nbdist/
 .nb-gradle/
 
-# End of https://www.toptal.com/developers/gitignore/api/intellij,netbeans,java
\ No newline at end of file
+# End of https://www.toptal.com/developers/gitignore/api/intellij+all,netbeans,java
\ No newline at end of file