mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
Resolve merge conflicts in: - Localizable.xcstrings (new translation keys from 2.7.10) - MeshtasticTests/RouterTests.swift (trailing comma style) - MeshtasticTests/ConnectViewTests.swift (trailing comma style) Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> |
||
|---|---|---|
| .. | ||
| Connect | ||
| Helpers | ||
| Layouts | ||
| Messages | ||
| Nodes | ||
| Onboarding | ||
| Settings | ||
| ContentView.swift | ||