Merge remote-tracking branch 'refs/remotes/origin/main'
This commit is contained in:
@@ -1 +1,5 @@
|
||||
{"pid":7,"kind":"hermes-gateway","argv":["/opt/hermes/.venv/bin/hermes","gateway","run"],"start_time":3028669,"gateway_state":"draining","exit_reason":null,"restart_requested":false,"active_agents":0,"platforms":{},"updated_at":"2026-05-09T18:04:27.274373+00:00"}
|
||||
<<<<<<< HEAD
|
||||
{"pid":7,"kind":"hermes-gateway","argv":["/opt/hermes/.venv/bin/hermes","gateway","run"],"start_time":3028669,"gateway_state":"draining","exit_reason":null,"restart_requested":false,"active_agents":0,"platforms":{},"updated_at":"2026-05-09T18:04:27.274373+00:00"}
|
||||
=======
|
||||
{"pid": 7, "kind": "hermes-gateway", "argv": ["/opt/hermes/.venv/bin/hermes", "gateway", "run"], "start_time": 97270363, "gateway_state": "running", "exit_reason": null, "restart_requested": false, "active_agents": 0, "platforms": {}, "updated_at": "2026-05-09T17:16:32.582158+00:00"}
|
||||
>>>>>>> refs/remotes/origin/main
|
||||
|
||||
Reference in New Issue
Block a user