Commit 7638638d 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 2015ce46
...@@ -9,6 +9,7 @@ Name[et]=Angelfish ...@@ -9,6 +9,7 @@ Name[et]=Angelfish
Name[fr]=Angelfish Name[fr]=Angelfish
Name[gl]=Angelfish Name[gl]=Angelfish
Name[it]=Angelfish Name[it]=Angelfish
Name[lt]=Angelfish Name[lt]=Angelfish
Name[nl]=Angelfish Name[nl]=Angelfish
Name[pt]=Angelfish Name[pt]=Angelfish
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