Commit 7ea9ab78 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 e17b3047
......@@ -17,6 +17,7 @@ Name[nl]=KMuddy
Name[pl]=KMuddy
Name[pt]=KMuddy
Name[pt_BR]=KMuddy
Name[ru]=KMuddy
Name[sk]=KMuddy
Name[sv]=Kmuddy
Name[tr]=KMuddy
......
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