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"
11 years ago · 390178b4a6
parent 8b0b6a1468
commit 390178b4a6
1 changed files with 0 additions and 1 deletions
--- 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]=خلفية الحفظ لـ KConfig
 Comment[as]=KConfig ৰ বাবে ভঁৰালৰ বেকএন্ড
-Comment[ast]=Infraestructura d'atroxamientu pa KConfig
 Comment[be@latin]=Słužba schovišča dla systemy „KConfig”
 Comment[bg]=Storage backend for KConfig
 Comment[bn]=KConfig-এর স্টোরেজ ব্যাকেন্ড