l10n daemon script
|
e873eddcde
|
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"
|
2020-06-17 14:06:59 +02:00 |
|
l10n daemon script
|
0e33224079
|
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"
|
2020-06-11 05:34:59 +02:00 |
|
l10n daemon script
|
6f39937e75
|
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"
|
2020-06-07 05:04:18 +02:00 |
|
l10n daemon script
|
8eee929e22
|
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"
|
2020-06-05 05:03:19 +02:00 |
|
l10n daemon script
|
84072ff32d
|
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"
|
2020-06-02 05:19:27 +02:00 |
|
l10n daemon script
|
f98953380f
|
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"
|
2020-05-31 20:22:34 +02:00 |
|
l10n daemon script
|
60b1f83b48
|
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"
|
2020-05-15 06:13:41 +02:00 |
|
Nicolas Fella
|
ffb0f3db9f
|
Combine handler desktop files
|
2020-05-14 19:49:08 +00:00 |
|