Fixup: remove breakpoint conflict #2

nod-ai · Mar 7, 2024 · 877edcf · 877edcf
1 parent ef06d63
commit 877edcf
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/models/turbine_models/custom_models/sdxl_inference/sdxl_pipeline.py b/models/turbine_models/custom_models/sdxl_inference/sdxl_pipeline.py
@@ -125,7 +125,6 @@ def export_submodel(args, submodel):
             )
             return unet_vmfb, unet_external_weight_path
         case "vae_decode":
-<<<<<<< HEAD
             vae_decode_vmfb, vae_external_weight_path = vae.export_vae_model(
                 vae_torch,
                 args.hf_model_name,