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

Wed Nov 11 04:00:09 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 817a7396e735142813c4de5f0ea42f0b9d192c0b
      https://github.com/Kst-plot/kst/commit/817a7396e735142813c4de5f0ea42f0b9d192c0b
  Author: l10n daemon script <scripty at kde.org>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M src/datasources/tiff16source/kstdata_tiff16source.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"