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

Thu Jun 4 05:00:08 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: cf07792100daad7d1b3d4a3f39cbb11bedf90146
      https://github.com/Kst-plot/kst/commit/cf07792100daad7d1b3d4a3f39cbb11bedf90146
  Author: l10n daemon script <scripty at kde.org>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M src/plugins/dataobject/activitylevel/kstplugin_activitylevel.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"