Fix merge conflict

project-chip · Oct 16, 2024 · 3168f76 · 3168f76
1 parent e54b3bd
commit 3168f76
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/examples/fabric-admin/device_manager/DeviceManager.h b/examples/fabric-admin/device_manager/DeviceManager.h
@@ -211,11 +211,8 @@ class DeviceManager : public PairingDelegate
     bool mInitialized     = false;
     uint64_t mRequestId   = 0;
 
-<<<<<<< HEAD
-    CommissionerControl mCommissionerControl;
-=======
     BridgeSubscription mBridgeSubscriber;
->>>>>>> upstream/master
+    CommissionerControl mCommissionerControl;
 };
 
 /**