|
| From: | tumashu |
| Subject: | welate has faced comflict |
| Date: | Sun, 31 Dec 2023 08:20:43 +0800 (CST) |
merging tryton/health/locale/sv.po merging tryton/health_icd10/locale/sv.po merging tryton/health_icd10/locale/sv.po failed! 46 files updated, 1 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon (1)
| [Prev in Thread] | Current Thread | [Next in Thread] |