# Conflicts:
#	pom.xml
#	target/classes/common.properties
#	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst