Remove conflict marker
Merge pull request #194 from owncloud/master

Remove conflict marker