l10n daemon script
|
098b9bc2ae
|
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-01-14 04:49:26 +01:00 |
l10n daemon script
|
85085d8eb7
|
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-01-13 04:47:56 +01:00 |
l10n daemon script
|
5376808159
|
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-01-07 04:56:23 +01:00 |
l10n daemon script
|
ba3676e165
|
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-01-04 04:49:48 +01:00 |
Andrius Štikonas
|
0d88e26c8c
|
Add an experimental sfdisk backend.
|
2017-11-07 22:51:29 +00:00 |