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"
Adopac · May 25, 2022 · d6251f7 · d6251f7
1 parent 084bfeb
commit d6251f7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json
@@ -6,12 +6,12 @@
                 "Name": "Aleix Pol i Gonzalez"
             }
         ],
-        "Name": "Virtual Monitor",
         "Description": "Use your devices as virtual monitors",
         "EnabledByDefault": true,
         "Icon": "video-monitor",
         "Id": "kdeconnect_virtualmonitor",
         "License": "GPL",
+        "Name": "Virtual Monitor",
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ],