fix: r

ronething · ronething · commit ad704fbc1354 · 2025-10-27T14:23:03.000+08:00
Signed-off-by: Ashing Zheng &lt;axingfly@gmail.com&gt;
diff --git a/test/e2e/framework/manifests/ingress.yaml b/test/e2e/framework/manifests/ingress.yaml
@@ -426,13 +426,10 @@ spec:
             port: 3001
           initialDelaySeconds: 5
           periodSeconds: 5
-<<<<<<< HEAD
         securityContext: {}
-=======
         volumeMounts:
         - name: socket-volume
           mountPath: /sockets
->>>>>>> dc8b6621 (feat: add Unix socket support for inter-container communication (#2587))
       volumes:
       - name: ingress-config
         configMap:
