Commit 21c5b955 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 6cac594a
......@@ -3,6 +3,7 @@ Name=KWin Effect
Name[ca]=Efecte del KWin
Name[ca@valencia]=Efecte del KWin
Name[es]=Efecto de KWin
Name[it]=Effetto di KWin
Name[pt]=Efeito do KWin
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