# Conflicts: # pom.xml |
||
---|---|---|
.. | ||
codeStyles | ||
.gitignore | ||
.name | ||
compiler.xml | ||
encodings.xml | ||
jarRepositories.xml | ||
vcs.xml |
# Conflicts: # pom.xml |
||
---|---|---|
.. | ||
codeStyles | ||
.gitignore | ||
.name | ||
compiler.xml | ||
encodings.xml | ||
jarRepositories.xml | ||
vcs.xml |