Files
neochat/src
l10n daemon script 13f766d166 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"
2025-10-21 03:11:53 +00:00
..
2025-08-01 12:13:38 +02:00