It looks like I have to commit changes in order to pull an identical
file from GitHub
Merge branch 'master' of https://github.com/Nasdanika/server.git

Conflicts:
	org.nasdanika.cdo.security/.classpath