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"
2 years ago · db47394e33
parent d7e9fbe772
commit db47394e33
1 changed files with 0 additions and 1 deletions
--- a/indicators/default/metadata.json
+++ b/indicators/default/metadata.json
@ -53,7 +53,6 @@
        "License": "GPL v2+",
        "Name": "Latte",
        "Name[ar]": "لاتيه",
-        "Name[ast]": "Latte",
        "Name[az]": "Latte",
        "Name[ca@valencia]": "Latte",
        "Name[ca]": "Latte",