Trying to fix merge conflicts.
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,3 +1,6 @@
|
||||
.DS_Store
|
||||
*.iml
|
||||
*.ipr
|
||||
target
|
||||
.springBeans
|
||||
.ant-targets-build.xml
|
||||
|
||||
Reference in New Issue
Block a user