l10n daemon script
|
bd2586f33a
|
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"
|
2021-05-17 01:36:50 +00:00 |
|
l10n daemon script
|
0c13326ab1
|
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"
|
2021-05-15 01:20:25 +00:00 |
|
l10n daemon script
|
f941019a16
|
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"
|
2021-05-14 01:15:32 +00:00 |
|
l10n daemon script
|
f794ebd899
|
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"
|
2021-05-11 01:18:58 +00:00 |
|
l10n daemon script
|
1fdb1ccc55
|
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"
|
2021-05-10 01:21:32 +00:00 |
|
l10n daemon script
|
508f353104
|
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"
|
2021-05-09 01:21:36 +00:00 |
|
l10n daemon script
|
86327a98d8
|
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"
|
2021-05-08 01:18:40 +00:00 |
Bart De Vries
|
1c44e717ae
|
Renaming alligator to kasts everywhere
|
2021-05-03 22:31:45 +02:00 |