modified for working around files created during merge

ldebug · Sep 10, 2014 · 624e8a4 · 624e8a4
1 parent 6d431ca
commit 624e8a4
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,14 @@
 /nbactions.xml
 .project
 /target
+.classpath
+.idea/
+.settings/
+src/main/main.iml
+*.BACKUP.*.jsp
+*.BASE.*.jsp
+*.LOCAL.*.jsp
+*.REMOTE.*.jsp
+
+
+