From 5dec95f35c1b906d1375006a0d3e8a5fa4eb2e32 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 28 Apr 2026 02:48:45 +0100
Subject: [PATCH] test(macos): stabilize gateway control test

---
 .../OpenClawIPCTests/GatewayConnectionControlTests.swift      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/macos/Tests/OpenClawIPCTests/GatewayConnectionControlTests.swift b/apps/macos/Tests/OpenClawIPCTests/GatewayConnectionControlTests.swift
index e750bb7e52b..374f88c04a0 100644
--- a/apps/macos/Tests/OpenClawIPCTests/GatewayConnectionControlTests.swift
+++ b/apps/macos/Tests/OpenClawIPCTests/GatewayConnectionControlTests.swift
@@ -33,8 +33,8 @@ private final class FakeWebSocketTask: WebSocketTasking, @unchecked Sendable {
                 self.respondedRequestIds.insert(request.id)
                 if request.method == "connect" {
                     return .string("""
-                    {"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":{}}}
+<<<<<<< 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":{}}}
                     """)
                 }
                 return .string("""