l10n daemon script
|
8e3a03beb4
|
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"
|
2019-11-16 05:03:41 +01:00 |
|
l10n daemon script
|
3c628b921e
|
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"
|
2019-05-20 05:39:37 +02:00 |
|
l10n daemon script
|
c98ed27c73
|
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"
|
2018-10-10 06:50:31 +02:00 |
|
l10n daemon script
|
08cc1d8754
|
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"
|
2018-08-30 05:50:59 +02:00 |
|
l10n daemon script
|
55e692fa53
|
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"
|
2018-06-16 05:37:17 +02:00 |
|
l10n daemon script
|
b58419fb50
|
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"
|
2018-06-07 05:47:03 +02:00 |
|
Marco Martin
|
da77551aff
|
merge quicksettings and the panel
use plasmoids
|
2017-09-14 21:03:56 +02:00 |
|