Commit d153f05f 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 dda777fe
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Name=Angelfish Name=Angelfish
Name[ca]=Angelfish Name[ca]=Angelfish
Name[cs]=Angelfish Name[cs]=Angelfish
Name[en_GB]=Angelfish
Name[es]=Angelfish Name[es]=Angelfish
Name[lt]=Angelfish Name[lt]=Angelfish
Name[nl]=Angelfish Name[nl]=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