mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
Fix merge conflict
This commit is contained in:
parent
6f0fe8fd6f
commit
61a6776b71
1 changed files with 5 additions and 2 deletions
|
|
@ -6,8 +6,11 @@ import SwiftUI
|
|||
|
||||
@available(iOS 17.0, *)
|
||||
struct ContentView: View {
|
||||
@ObservedObject var appState: AppState
|
||||
@ObservedObject var router: Router
|
||||
@ObservedObject
|
||||
var appState: AppState
|
||||
|
||||
@ObservedObject
|
||||
var router: Router
|
||||
|
||||
var body: some View {
|
||||
TabView(selection: Binding(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue