l10n daemon script
|
f94e5bc843
|
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"
|
3 years ago |
|
l10n daemon script
|
163720adef
|
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"
|
3 years ago |
|
l10n daemon script
|
1c9ec6ef73
|
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"
|
3 years ago |
|
l10n daemon script
|
866fc3eb16
|
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"
|
3 years ago |
Alexander Lohnau
|
a2fb837ea1
|
Configure metadata for plasmoid, remove versions where not needed
|
3 years ago |