conflicts

sayakpaul · sayakpaul · commit be0afc49c14d · 2024-10-23T17:41:19.000+05:30
diff --git a/src/diffusers/models/controlnet.py b/src/diffusers/models/controlnet.py
@@ -12,7 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from ..utils import deprecate
-from .controlnets.controlnet import ControlNetConditioningEmbedding, ControlNetModel, ControlNetOutput
+from .controlnets.controlnet import (
+    ControlNetConditioningEmbedding,
+    ControlNetModel,
+    ControlNetOutput,
+)
 
 
 class ControlNetOutput(ControlNetOutput):
