Files
neochat/src
l10n daemon script 83b1daac07 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-09-30 01:36:30 +00:00
..
2025-09-15 14:24:42 +02:00
2025-09-15 14:15:38 +02:00
2025-09-15 13:51:23 +02:00
2025-09-15 14:29:55 +02:00