[Kst] [Kst-plot/kst] 837316: SVN_SILENT made messages (.desktop file) - always ...

Mon Apr 27 05:00:11 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 8373161ff1af017db400df44fff9b60bc7f2a7d1
      https://github.com/Kst-plot/kst/commit/8373161ff1af017db400df44fff9b60bc7f2a7d1
  Author: l10n daemon script <scripty at kde.org>
  Date:   2015-04-27 (Mon, 27 Apr 2015)

  Changed paths:
    M src/datasources/bis/kstdata_bissource.desktop

  Log Message:
  -----------
  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"