[Kst-plot/kst] 2e05bb: GIT_SILENT made messages (after extraction)

[netterfield]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 2e05bb1960c4053f7685c87f50c4a419f768fcb1
      https://github.com/Kst-plot/kst/commit/2e05bb1960c4053f7685c87f50c4a419f768fcb1
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-10-17 (Thu, 17 Oct 2019)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: 71f36b82c254860ed15d27059a2924eac5f34a88
      https://github.com/Kst-plot/kst/commit/71f36b82c254860ed15d27059a2924eac5f34a88
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-10-17 (Thu, 17 Oct 2019)

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


  Commit: cd241e96ac33b9c7c658ff690c199d549faf2d37
      https://github.com/Kst-plot/kst/commit/cd241e96ac33b9c7c658ff690c199d549faf2d37
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-12-05 (Thu, 05 Dec 2019)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: f162ff5744bbba5d265f3b1bd868debcfbbc10d3
      https://github.com/Kst-plot/kst/commit/f162ff5744bbba5d265f3b1bd868debcfbbc10d3
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-12-21 (Sat, 21 Dec 2019)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: 5a94141368ab8c1a08a17cc7c3d92ffa74da2a01
      https://github.com/Kst-plot/kst/commit/5a94141368ab8c1a08a17cc7c3d92ffa74da2a01
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-01-03 (Fri, 03 Jan 2020)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: 132c0a14e6d581534646a994925ad52597c80dff
      https://github.com/Kst-plot/kst/commit/132c0a14e6d581534646a994925ad52597c80dff
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-01-09 (Thu, 09 Jan 2020)

  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
    M src/datasources/bis/kstdata_bissource.desktop
    M src/datasources/dirfilesource/kstdata_dirfilesource.desktop
    M src/datasources/fitsimage/kstdata_fitsimage.desktop
    M src/datasources/fitstable/kstdata_fitstable.desktop
    M src/datasources/hdf5/kstdata_hdf5.desktop
    M src/datasources/its/kstdata_itssource.desktop
    M src/datasources/matlab/kstdata_matlab.desktop
    M src/datasources/netcdf/kstdata_netcdf.desktop
    M src/datasources/qimagesource/kstdata_qimagesource.desktop
    M src/datasources/sampledatasource/kstdata_sampledatasource.desktop
    M src/datasources/sourcelist/kstdata_sourcelist.desktop
    M src/datasources/tiff16source/kstdata_tiff16source.desktop
    M src/kst/kst2.desktop
    M src/plugins/fits/gaussian_unweighted/kstplugin_fits_gaussian_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"


Compare: https://github.com/Kst-plot/kst/compare/274079814c98...132c0a14e6d5