Commit Graph

3 Commits (ae69884e0431168fd470df693fbb44d2d886bcba)

Author SHA1 Message Date
l10n daemon script 5c09168968 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 348b617b49 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 ba08038bc0 add Latte/Indicator type and improve metadata 6 years ago