feat/UltraFlux-v1-image

Signed-off-by: Chen Yang <[email protected]>

Author: erfgss

vllm_omni/diffusion/registry.py

@@ -79,26 +79,12 @@
         "ultraflux-v1_image",
         "pipeline_ultraflux",
         "UltraFluxPipeline",
-<<<<<<< HEAD
     ),
     "Flux2KleinPipeline": (
         "flux2_klein",
         "pipeline_flux2_klein",
         "Flux2KleinPipeline",
     ),
-=======
-    ),  # FluxPipeline
-
->>>>>>> a34d4a9 ([Model] add flux2 klein (#809))
-    "Flux2KleinPipeline": (
-        "flux2_klein",
-        "pipeline_flux2_klein",
-        "Flux2KleinPipeline",
-    ),
-<<<<<<< HEAD
-=======
-
->>>>>>> a34d4a9 ([Model] add flux2 klein (#809))
 }