modified for working around files created during merge
This commit is contained in:
parent
6d431ca1fd
commit
624e8a40e3
11
.gitignore
vendored
11
.gitignore
vendored
@ -2,3 +2,14 @@
|
|||||||
/nbactions.xml
|
/nbactions.xml
|
||||||
.project
|
.project
|
||||||
/target
|
/target
|
||||||
|
.classpath
|
||||||
|
.idea/
|
||||||
|
.settings/
|
||||||
|
src/main/main.iml
|
||||||
|
*.BACKUP.*.jsp
|
||||||
|
*.BASE.*.jsp
|
||||||
|
*.LOCAL.*.jsp
|
||||||
|
*.REMOTE.*.jsp
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user