Commit 742e2647 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent 5774dee2
......@@ -178,7 +178,7 @@ X-KDE-Keywords[eu]=konqueror,fitxak
X-KDE-Keywords[fi]=konqueror,välilehdet
X-KDE-Keywords[fr]=konqueror, onglets
X-KDE-Keywords[ga]=Konqueror,cluaisíní
X-KDE-Keywords[gl]=konqueror,lapelas
X-KDE-Keywords[gl]=konqueror,separadores
X-KDE-Keywords[he]=konqueror,tabs
X-KDE-Keywords[hu]=konqueror,lapok
X-KDE-Keywords[ia]=konqueror,schedas
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment