Commit 0a2656a2 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 500bc2e5
......@@ -58,4 +58,4 @@
"org.kdevelop.IStatus"
],
"X-KDevelop-Mode": "GUI"
}
\ No newline at end of file
}
......@@ -54,4 +54,4 @@
"org.kdevelop.IDocumentationProvider"
],
"X-KDevelop-Mode": "GUI"
}
\ No newline at end of file
}
......@@ -60,4 +60,4 @@
"org.kdevelop.IDocumentationProviderProvider"
],
"X-KDevelop-Mode": "GUI"
}
\ No newline at end of file
}
......@@ -59,4 +59,4 @@
],
"X-KDevelop-LoadMode": "AlwaysOn",
"X-KDevelop-Mode": "NoGUI"
}
\ No newline at end of file
}
......@@ -59,4 +59,4 @@
],
"X-KDevelop-LoadMode": "AlwaysOn",
"X-KDevelop-Mode": "NoGUI"
}
\ No newline at end of file
}
......@@ -58,4 +58,4 @@
"org.kdevelop.IExecutePlugin"
],
"X-KDevelop-Mode": "NoGUI"
}
\ No newline at end of file
}
......@@ -63,4 +63,4 @@
"text/x-c++src",
"text/x-objcsrc"
]
}
\ No newline at end of file
}
......@@ -66,4 +66,4 @@
"text/x-csrc",
"text/x-c++src"
]
}
\ No newline at end of file
}
......@@ -52,4 +52,4 @@
],
"X-KDevelop-LoadMode": "AlwaysOn",
"X-KDevelop-Mode": "NoGUI"
}
\ No newline at end of file
}
......@@ -39,4 +39,4 @@
"text/x-qml",
"application/javascript"
]
}
\ No newline at end of file
}
......@@ -59,4 +59,4 @@
],
"X-KDevelop-Mode": "NoGUI",
"X-KDevelop-ProjectBuilder": "CMake"
}
\ No newline at end of file
}
......@@ -56,4 +56,4 @@
"org.kdevelop.IMakeBuilder"
],
"X-KDevelop-Mode": "NoGUI"
}
\ No newline at end of file
}
......@@ -56,4 +56,4 @@
"org.kdevelop.IProjectBuilder"
],
"X-KDevelop-Mode": "NoGUI"
}
\ No newline at end of file
}
......@@ -58,4 +58,4 @@
],
"X-KDevelop-Mode": "NoGUI",
"X-KDevelop-ProjectBuilder": "QMake"
}
\ No newline at end of file
}
......@@ -67,4 +67,4 @@
"X-KDevelop-SupportedMimeTypes": [
"text/x-cmake"
]
}
\ No newline at end of file
}
......@@ -76,4 +76,4 @@
"X-KDevelop-SupportedMimeTypes": [
"text/x-cmake"
]
}
\ No newline at end of file
}
......@@ -59,4 +59,4 @@
"org.kdevelop.IBuildSystemManager"
],
"X-KDevelop-Mode": "NoGUI"
}
\ No newline at end of file
}
......@@ -67,4 +67,4 @@
"makefile.*"
],
"X-KDevelop-ProjectFilesFilterDescription": "Makefiles"
}
\ No newline at end of file
}
......@@ -62,4 +62,4 @@
"*.pro"
],
"X-KDevelop-ProjectFilesFilterDescription": "QMake Project Files"
}
\ No newline at end of file
}
......@@ -59,4 +59,4 @@
"org.kdevelop.IProjectProvider"
],
"X-KDevelop-Mode": "GUI"
}
\ No newline at end of file
}
......@@ -63,4 +63,4 @@
"org.kdevelop.IProjectProvider"
],
"X-KDevelop-Mode": "GUI"
}
\ No newline at end of file
}
......@@ -58,4 +58,4 @@
"X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI",
"X-KDevelop-Version": "@KDEV_PLUGIN_VERSION@"
}
\ 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