Skip to content

Commit 624e8a4

Browse files
committed
modified for working around files created during merge
1 parent 6d431ca commit 624e8a4

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,14 @@
22
/nbactions.xml
33
.project
44
/target
5+
.classpath
6+
.idea/
7+
.settings/
8+
src/main/main.iml
9+
*.BACKUP.*.jsp
10+
*.BASE.*.jsp
11+
*.LOCAL.*.jsp
12+
*.REMOTE.*.jsp
13+
14+
15+

0 commit comments

Comments
 (0)