test(macos): remove conflict marker

apps/macos/Tests/OpenClawIPCTests/GatewayConnectionControlTests.swift

@@ -33,7 +33,6 @@ private final class FakeWebSocketTask: WebSocketTasking, @unchecked Sendable {
                 self.respondedRequestIds.insert(request.id)
                 if request.method == "connect" {
                     return .string("""
-<<<<<<< HEAD
                     {"type":"res","id":"\(request.id)","ok":true,"payload":{"type":"hello","protocol":3,"server":{},"features":{},"snapshot":{"presence":[],"health":{},"stateVersion":{"presence":0,"health":0},"uptimeMs":0},"auth":{},"policy":{}}}
                     """)
                 }