Commit eb5c0996 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 56b6c019
......@@ -19,6 +19,10 @@
"Version": "0.1",
"Website": "https://kde.org"
},
"X-KdeConnect-OutgoingPackageType": [ "kdeconnect.lock" ],
"X-KdeConnect-SupportedPackageType": [ "kdeconnect.lock" ]
"X-KdeConnect-OutgoingPackageType": [
"kdeconnect.lock"
],
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.lock"
]
}
\ No newline at end of file
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