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

Fri Apr 3 05:00:11 UTC 2015

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

  Changed paths:
    M src/kst/kst2.desktop
    M src/kst/x-kst2.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"