From c3444a8d2dce0ebc5ccf0e8be7211be11007a426 Mon Sep 17 00:00:00 2001
From: Roland Tannous <rolandtannous@gravityq.ai>
Date: Sun, 31 May 2026 21:05:14 +0400
Subject: [PATCH] fixed  onflicts

---
 unsloth_cli/commands/studio.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/unsloth_cli/commands/studio.py b/unsloth_cli/commands/studio.py
index c729245dcf..cf614d2d91 100644
--- a/unsloth_cli/commands/studio.py
+++ b/unsloth_cli/commands/studio.py
@@ -371,7 +371,6 @@ def studio_default(
     host: str = typer.Option("127.0.0.1", "--host", "-H"),
     frontend: Optional[Path] = typer.Option(None, "--frontend", "-f"),
     silent: bool = typer.Option(False, "--silent", "-q"),
-<<<<<<< HEAD
     api_only: bool = typer.Option(
         False,
         "--api-only",
@@ -389,8 +388,6 @@ def studio_default(
             f"defaults to {_PARALLEL_DEFAULT_RUN}."
         ),
     ),
-=======
->>>>>>> 09566d730 (fix failed to start on docker)
 ):
     """Launch the Unsloth Studio server."""
     # Runs before every subcommand (run/setup/update/...).