modified for working around files created during merge

This commit is contained in:
diver-sity 2014-09-10 21:23:09 +10:00
parent 6d431ca1fd
commit 624e8a40e3

11
.gitignore vendored
View File

@ -2,3 +2,14 @@
/nbactions.xml
.project
/target
.classpath
.idea/
.settings/
src/main/main.iml
*.BACKUP.*.jsp
*.BASE.*.jsp
*.LOCAL.*.jsp
*.REMOTE.*.jsp