-
# Conflicts: # web/src/main/webapp/META-INF/autoconf/config.properties
-
# Conflicts: # pom.xml # server/pom.xml # web/src/main/resources/META-INF/spring/spring-mvc.xml # web/src/main/webapp/META-INF/autoconf/config.properties # web/src/main/webapp/WEB-INF/web.xml
