Fix triplicated documents when occurs git conflict

Davi Marinhorequested to merge
davimarinho/kate:fix-duplicate-doc into master

Fix wrong triplicated documents when occurs a git conflict. Now it shows correctly only one document.

Edited by Davi Marinho

Merge request reports