From 573cb04c775842bc87c8b2f84ee3372565304498 Mon Sep 17 00:00:00 2001
From: Beyondo <58893646+Beyondo@users.noreply.github.com>
Date: Thu, 22 Dec 2022 14:37:32 +0300
Subject: [PATCH] Update v0.8.12

---
 legacy/colab.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/legacy/colab.py b/legacy/colab.py
index ee7cb25..b391c92 100644
--- a/legacy/colab.py
+++ b/legacy/colab.py
@@ -4,10 +4,6 @@
 from IPython.display import HTML
 from diffusers import StableDiffusionImg2ImgPipeline, StableDiffusionInpaintPipeline
 import env, PerformancePipeline, importlib
-<<<<<<< HEAD
-from hax import safety_patcher
-=======
->>>>>>> Dev
 importlib.reload(PerformancePipeline)
 model_name = ""
 inpaint_model_name = ""