Fix merge

Author: andreilitvin

examples/fabric-bridge-app/fabric-bridge-common/include/BridgedDevice.h

@@ -65,25 +65,12 @@ class BridgedDevice
     void SetUniqueId(const std::string & value) { mAttributes.uniqueId = value; }
 
 protected:
-<<<<<<< HEAD
     bool mReachable = false;
     bool mIsIcd     = false;
 
     chip::NodeId mNodeId               = 0;
     chip::EndpointId mEndpointId       = 0;
     chip::EndpointId mParentEndpointId = 0;
-||||||| a315c91a2d
-    bool mReachable;
-    chip::NodeId mNodeId;
-    chip::EndpointId mEndpointId;
-    chip::EndpointId mParentEndpointId;
-=======
-    bool mReachable;
-    bool mIsIcd = false;
-    chip::NodeId mNodeId;
-    chip::EndpointId mEndpointId;
-    chip::EndpointId mParentEndpointId;
->>>>>>> master
 
     BridgedAttributes mAttributes;
 };