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"
remotes/origin/work/2004_421508
l10n daemon script 6 years ago
parent b82682037e
commit 5dfbee0a00
  1. 1
      generators/comicbook/org.kde.mobile.okular_comicbook.desktop

@ -167,7 +167,6 @@ X-KDE-Keywords[eu]=cbr, cbz, cbt, komiki-liburua
X-KDE-Keywords[fi]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[fr]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[gl]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[ia]=cbr, cbz, cbt, Comic Book(Libro de Comic)
X-KDE-Keywords[it]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[lt]=cbr, cbz, cbt, Comic Book, komiksų knygos, komiksu knygos
X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie

Loading…
Cancel
Save