Skip to content

Commit 3140efa

Browse files
committed
Resolve conflicts
1 parent f24df18 commit 3140efa

File tree

9 files changed

+6318
-6318
lines changed

9 files changed

+6318
-6318
lines changed

β€Žsrc/Misc/layoutbin/de-DE/strings.json

Lines changed: 702 additions & 702 deletions
Large diffs are not rendered by default.

β€Žsrc/Misc/layoutbin/es-ES/strings.json

Lines changed: 702 additions & 702 deletions
Large diffs are not rendered by default.

β€Žsrc/Misc/layoutbin/fr-FR/strings.json

Lines changed: 702 additions & 702 deletions
Large diffs are not rendered by default.

β€Žsrc/Misc/layoutbin/it-IT/strings.json

Lines changed: 702 additions & 702 deletions
Large diffs are not rendered by default.

β€Žsrc/Misc/layoutbin/ja-JP/strings.json

Lines changed: 702 additions & 702 deletions
Large diffs are not rendered by default.

β€Žsrc/Misc/layoutbin/ko-KR/strings.json

Lines changed: 702 additions & 702 deletions
Large diffs are not rendered by default.

β€Žsrc/Misc/layoutbin/ru-RU/strings.json

Lines changed: 702 additions & 702 deletions
Large diffs are not rendered by default.

β€Žsrc/Misc/layoutbin/zh-CN/strings.json

Lines changed: 702 additions & 702 deletions
Large diffs are not rendered by default.

β€Žsrc/Misc/layoutbin/zh-TW/strings.json

Lines changed: 702 additions & 702 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
Β (0)