# Conflicts:
#	.idea/workspace.xml
#	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst