mirror of
https://github.com/nexu-io/open-design.git
synced 2026-10-27 09:51:12 +01:00
Resolved conflicts in apps/web/src/i18n/content.{ts,fr,ru}.ts by
keeping both branches' EN-fallback additions: the 32 zhangzara
template ids from this branch and 'last30days' from main. Each
side wrote into the same DE/RU/FR fallback array so the conflict
was a pure additive overlap.
Co-authored-by: Cursor <cursoragent@cursor.com>