From 2e94cf26a7041400c6bed2a6970109feedee7034 Mon Sep 17 00:00:00 2001
From: bbedward <bbedward@gmail.com>
Date: Sat, 12 Jul 2025 21:50:42 -0400
Subject: [PATCH] Conflict fixes

---
 Widgets/ControlCenter/ControlCenterPopup.qml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/Widgets/ControlCenter/ControlCenterPopup.qml b/Widgets/ControlCenter/ControlCenterPopup.qml
index 59e59307..04340e56 100644
--- a/Widgets/ControlCenter/ControlCenterPopup.qml
+++ b/Widgets/ControlCenter/ControlCenterPopup.qml
@@ -633,11 +633,7 @@ PanelWindow {
                 BluetoothTab {
                     anchors.fill: parent
                     anchors.margins: Theme.spacingM
-<<<<<<< HEAD
-                    visible: root.bluetoothAvailable && controlCenterPopup.currentTab === 2
-=======
-                    visible: controlCenterPopup.currentTab === "bluetooth"
->>>>>>> 86d4c7a429ff69eb5d4da204f98f045ed4634ad3
+                    visible: root.bluetoothAvailable && controlCenterPopup.currentTab === "bluetooth"
                     
                     // Bind properties from root
                     bluetoothEnabled: root.bluetoothEnabled
@@ -648,11 +644,7 @@ PanelWindow {
                 DisplayTab {
                     anchors.fill: parent
                     anchors.margins: Theme.spacingM
-<<<<<<< HEAD
-                    visible: controlCenterPopup.currentTab === (root.bluetoothAvailable ? 3 : 2)
-=======
                     visible: controlCenterPopup.currentTab === "display"
->>>>>>> 86d4c7a429ff69eb5d4da204f98f045ed4634ad3
                     
                 }
             }