Commit Graph

3 Commits (06c965248c8c074f76b360786e056e5e46a5401d)

Author SHA1 Message Date
l10n daemon script c7207c3037 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"
6 years ago
l10n daemon script 66be70a319 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"
6 years ago
Michail Vourlakos 28ef36a774 simplify indicators names 6 years ago