l10n daemon script
2016-03-15 05:00:10 UTC
Branch: refs/heads/master
Home: https://github.com/Kst-plot/kst
Commit: adf1031768277d7d7c7e5ff6a76cfc5106a7d891
https://github.com/Kst-plot/kst/commit/adf1031768277d7d7c7e5ff6a76cfc5106a7d891
Author: l10n daemon script <***@kde.org>
Date: 2016-03-15 (Tue, 15 Mar 2016)
Changed paths:
M src/datasources/tiff16source/kstdata_tiff16source.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"
Home: https://github.com/Kst-plot/kst
Commit: adf1031768277d7d7c7e5ff6a76cfc5106a7d891
https://github.com/Kst-plot/kst/commit/adf1031768277d7d7c7e5ff6a76cfc5106a7d891
Author: l10n daemon script <***@kde.org>
Date: 2016-03-15 (Tue, 15 Mar 2016)
Changed paths:
M src/datasources/tiff16source/kstdata_tiff16source.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"