diff options
| author | l10n daemon script <scripty@kde.org> | 2016-12-20 12:50:08 +0100 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2016-12-20 12:50:08 +0100 |
| commit | f86f153a8050c9337e0f6c7b84171f50474df3b1 (patch) | |
| tree | fb0e734fac35d6b74db5341188a67a8e88585d4d | |
| parent | b4206d635444580bd00a0e7dabd939d86134ee72 (diff) | |
| download | kconfig-f86f153a8050c9337e0f6c7b84171f50474df3b1.tar.gz kconfig-f86f153a8050c9337e0f6c7b84171f50474df3b1.tar.bz2 | |
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"
| -rw-r--r-- | src/core/kconfigbackend.desktop | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/kconfigbackend.desktop b/src/core/kconfigbackend.desktop index 37e1b961..5e85f2b8 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -5,7 +5,6 @@ X-KDE-ServiceType=KConfigBackend Comment=Storage backend for KConfig Comment[ar]=سند «ضبطك» للتّخزين Comment[as]=KConfig ৰ বাবে ভঁৰালৰ বেকএন্ড -Comment[ast]=Backend d'almacenamientu pa KConfig Comment[be@latin]=Słužba schovišča dla systemy „KConfig” Comment[bg]=Storage backend for KConfig Comment[bn]=KConfig-এর স্টোরেজ ব্যাকেন্ড |