# Conflicts: # web/src/main/resources/config.properties # web/src/main/webapp/META-INF/autoconf/config.properties