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

[l10n daemon script]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: ec7b17d8f96af4c36422098b9fd6246e0a658f3f
      https://github.com/Kst-plot/kst/commit/ec7b17d8f96af4c36422098b9fd6246e0a658f3f
  Author: l10n daemon script <scripty at kde.org>
  Date:   2015-04-19 (Sun, 19 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"