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

[l10n daemon script]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 140db70aa8ea317a5cd44d3eb6f17568bc549ef8
      https://github.com/Kst-plot/kst/commit/140db70aa8ea317a5cd44d3eb6f17568bc549ef8
  Author: l10n daemon script <scripty at kde.org>
  Date:   2016-02-13 (Sat, 13 Feb 2016)

  Changed paths:
    M old_datasources/dmc/kstdata_dmc.desktop
    M old_datasources/healpix/kstdata_healpix.desktop
    M src/plugins/filters/differentiation/kstplugin_differentiation.desktop
    M src/plugins/filters/flag/kstplugin_filter_flag.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"