Commit bc7e4c6f authored by Script Kiddy's avatar Script Kiddy
Browse files

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 59008501
...@@ -21,6 +21,7 @@ Name[pt]=KMuddy ...@@ -21,6 +21,7 @@ Name[pt]=KMuddy
Name[pt_BR]=KMuddy Name[pt_BR]=KMuddy
Name[ru]=KMuddy Name[ru]=KMuddy
Name[sk]=KMuddy Name[sk]=KMuddy
Name[sv]=Kmuddy Name[sv]=Kmuddy
Name[tr]=KMuddy Name[tr]=KMuddy
Name[uk]=KMuddy Name[uk]=KMuddy
Supports Markdown
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