Commit graph

5 commits

Author SHA1 Message Date
l10n daemon script
c632dab1c1 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"
2022-07-03 01:57:41 +00:00
l10n daemon script
9a913e1783 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"
2022-07-02 02:04:13 +00:00
l10n daemon script
1629733d7e 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"
2022-06-30 01:45:48 +00:00
l10n daemon script
6a0fcc83fd 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"
2022-06-29 01:46:28 +00:00
Devin Lin
c0642a6d41 bin: Add development session support 2022-06-27 12:42:19 -04:00