Commit 2bdabcf7 authored by Script Kiddy's avatar Script Kiddy

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 d0be666c
......@@ -56,14 +56,14 @@
]
},
"X-KDevelop-Category": "Project",
"X-KDevelop-IRequired": [
"org.kdevelop.IProjectBuilder@KDevCMakeBuilder"
],
"X-KDevelop-Interfaces": [
"org.kdevelop.IBuildSystemManager",
"org.kdevelop.IProjectFileManager",
"ILanguageSupport"
],
"X-KDevelop-IRequired": [
"org.kdevelop.IProjectBuilder@KDevCMakeBuilder"
],
],
"X-KDevelop-Language": "CMake",
"X-KDevelop-LoadMode": "AlwaysOn",
"X-KDevelop-Mode": "GUI",
......
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