From 61a6776b716b4b28139b14ed59d1978687894cfe Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Sun, 11 Aug 2024 18:18:27 -0700
Subject: [PATCH] Fix merge conflict

---
 Meshtastic/Views/ContentView.swift | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Meshtastic/Views/ContentView.swift b/Meshtastic/Views/ContentView.swift
index 4ab6ac85..e8384c35 100644
--- a/Meshtastic/Views/ContentView.swift
+++ b/Meshtastic/Views/ContentView.swift
@@ -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(