Commit Graph

2 Commits

Author SHA1 Message Date
l10n daemon script
c172a91627 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"
2020-06-08 05:15:01 +02:00
Tobias Fella
b8ee516162 Change file names 2020-06-06 18:23:04 +02:00