Remove merge conflict markers and clean up tool handling in call_tool function

Author: AnCarsenat

minecode/server.py

@@ -1458,7 +1458,6 @@ async def call_tool(name: str, arguments: dict) -> list[TextContent]:
                 recipe_type=arguments.get("recipe_type", "all"),
                 search=arguments.get("search")
             )
-<<<<<<< HEAD
         # Minecraft logs tools
         elif name == "get_minecraft_logs":
             result = handle_get_minecraft_logs(
@@ -1490,12 +1489,11 @@ async def call_tool(name: str, arguments: dict) -> list[TextContent]:
             result = handle_launcher_clear_minecraft_logs(
                 launcher_type=arguments["launcher_type"],
                 instance_name=arguments["instance_name"]
-=======
+            )
         elif name == "validate_function":
             result = handle_validate_function(
                 function_path=arguments["function_path"],
                 version=arguments["version"]
->>>>>>> copilot/add-validate-function-command
             )
         else:
             raise ValueError(f"Unknown tool: {name}")