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

[l10n daemon script]

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

  Changed paths:
    M src/datasources/bis/kstdata_bissource.desktop
    M src/datasources/fitstable/kstdata_fitstable.desktop
    M src/plugins/dataobject/activitylevel/kstplugin_activitylevel.desktop
    M src/plugins/filters/window/kstplugin_filter_window.desktop
    M src/plugins/fits/exponential_unweighted/kstplugin_fits_exponential_unweighted.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"