fix merge conflict

hlky · hlky · commit 9276ced358f6 · 2024-12-20T11:30:19.000Z
diff --git a/src/diffusers/loaders/__init__.py b/src/diffusers/loaders/__init__.py
@@ -75,7 +75,6 @@ def text_encoder_attn_modules(text_encoder):
             "SanaLoraLoaderMixin",
         ]
         _import_structure["textual_inversion"] = ["TextualInversionLoaderMixin"]
-        _import_structure["ip_adapter"] = ["IPAdapterMixin"]
         _import_structure["ip_adapter"] = [
             "IPAdapterMixin",
             "FluxIPAdapterMixin",

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@ def text_encoder_attn_modules(text_encoder):`
`75`	`75`	`"SanaLoraLoaderMixin",`
`76`	`76`	`]`
`77`	`77`	`_import_structure["textual_inversion"] = ["TextualInversionLoaderMixin"]`
`78`		`- _import_structure["ip_adapter"] = ["IPAdapterMixin"]`
`79`	`78`	`_import_structure["ip_adapter"] = [`
`80`	`79`	`"IPAdapterMixin",`
`81`	`80`	`"FluxIPAdapterMixin",`