From 1ad8c6e5041d64a6862cbbfdfa2ddda9811ef9d1 Mon Sep 17 00:00:00 2001 From: David Sarno Date: Mon, 29 Sep 2025 20:14:46 -0700 Subject: [PATCH] resolve merge conflicts from main --- UnityMcpBridge/UnityMcpServer~/src/tools/manage_gameobject.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnityMcpBridge/UnityMcpServer~/src/tools/manage_gameobject.py b/UnityMcpBridge/UnityMcpServer~/src/tools/manage_gameobject.py index c36a09d..eb766ff 100644 --- a/UnityMcpBridge/UnityMcpServer~/src/tools/manage_gameobject.py +++ b/UnityMcpBridge/UnityMcpServer~/src/tools/manage_gameobject.py @@ -145,4 +145,4 @@ def register_manage_gameobject_tools(mcp: FastMCP): return response if isinstance(response, dict) else {"success": False, "message": str(response)} except Exception as e: - return {"success": False, "message": f"Python error managing GameObject: {str(e)}"} + return {"success": False, "message": f"Python error managing GameObject: {str(e)}"} \ No newline at end of file