-
# Conflicts: # web/src/main/webapp/META-INF/autoconf/auto-config.xml # web/src/main/webapp/META-INF/autoconf/config.properties
-
# Conflicts: # deploy/src/main/META-INF/autoconf/auto-config.xml # deploy/src/main/bin/env.bat # deploy/src/main/bin/env.sh # web/src/main/webapp/META-INF/autoconf/auto-config.xml # web/src/main/webapp/META-INF/autoconf/databases.yml
-
# Conflicts: # .gitignore