I need to add this file to .gitignore.
Merge branch 'HEAD' of https://github.com/r24mille/TimeOfEmissions.git

Conflicts:
	target/m2e-wtp/web-resources/META-INF/MANIFEST.MF