fix: resolve merge conflict in checkpointing.py

edjson · edjson · commit 5a56bbd859ba · 2026-04-07T18:26:02.000-07:00
Signed-off-by: Edison &lt;edisonggacc@gmail.com&gt;
diff --git a/nemo_automodel/components/checkpoint/checkpointing.py b/nemo_automodel/components/checkpoint/checkpointing.py
@@ -76,11 +76,7 @@ def _ensure_msc_available() -> None:
     """Raise an error if MSC is not installed but a cloud path is used."""
     if not MSC_AVAILABLE:
         raise ImportError(
-<<<<<<< HEAD
-            "multistorageclient is required for cloud storage paths. "
-=======
             "multistorageclient is required for cloud storage paths."
->>>>>>> 91a223c (fix: address review comments - PEFT cloud path, optional dependencies, and unit test fixes)
             "Install it with: pip install multi-storage-client "
             "--index-url https://pypi.nvidia.com"
         )
diff --git a/pyproject.toml b/pyproject.toml
@@ -88,7 +88,6 @@ dependencies = [
     "mlflow",
     "flashoptim>=0.1.3",
 ]
-
 [project.optional-dependencies]
 cloud = ["multi-storage-client",]
 dev = ["localstack>=2026.3.0",]

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,6 @@ dependencies = [`
`88`	`88`	`"mlflow",`
`89`	`89`	`"flashoptim>=0.1.3",`
`90`	`90`	`]`
`91`		`-`
`92`	`91`	`[project.optional-dependencies]`
`93`	`92`	`cloud = ["multi-storage-client",]`
`94`	`93`	`dev = ["localstack>=2026.3.0",]`