# Conflicts: # .idea/workspace.xml |
||
---|---|---|
.. | ||
.name | ||
compiler.xml | ||
encodings.xml | ||
jarRepositories.xml | ||
libraries-with-intellij-classes.xml | ||
misc.xml | ||
modules.xml | ||
vcs.xml | ||
workspace.xml |
# Conflicts: # .idea/workspace.xml |
||
---|---|---|
.. | ||
.name | ||
compiler.xml | ||
encodings.xml | ||
jarRepositories.xml | ||
libraries-with-intellij-classes.xml | ||
misc.xml | ||
modules.xml | ||
vcs.xml | ||
workspace.xml |