Commit 6818cbe8 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 3b91acf0
......@@ -3,7 +3,8 @@
"Authors": [
{
"Email": "simon@ergotech.com",
"Name": "Simon Redman"
"Name": "Simon Redman",
"Name[x-test]": "xxSimon Redmanxx"
}
],
"Description": "Send and receive SMS",
......
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