merge conflict, no changes, strange...

This stupid "revert" happened because I suddenly had funny <CR> characters in the file, which I cleaned up (replaced by normal new line) and then after git pulling I got a merge conflict
Merge branch 'master' of github.com:/rapila/cms-base
Merge branch 'master' of github.com:/rapila/cms-base