l10n daemon script
|
b830c8f33b
|
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-12-19 05:49:03 +01:00 |
|
l10n daemon script
|
1066964d63
|
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-12-15 05:36:37 +01:00 |
|
l10n daemon script
|
7b3a3d50e5
|
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-12-14 05:35:48 +01:00 |
|
l10n daemon script
|
b0134a5881
|
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-12-05 05:16:07 +01:00 |
|
l10n daemon script
|
e11eca64af
|
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-12-02 05:30:09 +01:00 |
|
l10n daemon script
|
82974505ed
|
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-12-01 05:28:44 +01:00 |
|
l10n daemon script
|
56880448fd
|
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-30 05:34:44 +01:00 |
|
l10n daemon script
|
447158038d
|
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-28 05:47:09 +01:00 |
|
l10n daemon script
|
83df9f1f47
|
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-27 05:46:04 +01:00 |
|
Nicolas Fella
|
fe22d26f85
|
Add missing file
|
2019-11-25 16:14:24 +01:00 |
|