c
 Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.
delete removed
resolve sync problems
Merge branch 'master' of https://github.com/Thagor/shop-impl

Conflicts:
	target/classes/META-INF/MANIFEST.MF
	target/classes/META-INF/maven/de.is.project.shop/shop-impl/pom.properties