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

l10n daemon script scripty at kde.org
Tue Dec 8 04:00:09 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: b196a00b2273e77e845f722057ec8d0b689e1405
  Author: l10n daemon script <scripty at kde.org>
  Date:   2015-12-08 (Tue, 08 Dec 2015)

  Changed paths:
    M old_datasources/dmc/kstdata_dmc.desktop
    M old_datasources/healpix/kstdata_healpix.desktop
    M old_datasources/lfiio/kstdata_lfiio.desktop
    M old_datasources/plankIDEF/kstdata_planckIDEF.desktop
    M src/datasources/ascii/kstdata_ascii.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"

More information about the Kst mailing list