Skip to content

S
Stable Diffusion Webui
Commit 390bffa8 authored by AUTOMATIC1111's avatar AUTOMATIC1111
Browse files
Options

repair merge error

parent 0c9b1e79
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
modules/sd_models.py
View file @ 390bffa8
...@@ -15,7 +15,6 @@ import ldm.modules.midas as midas ...@@ -15,7 +15,6 @@ import ldm.modules.midas as midas
from ldm.util import instantiate_from_config from ldm.util import instantiate_from_config
from modules import paths, shared, modelloader, devices, script_callbacks, sd_vae, sd_disable_initialization, errors, hashes, sd_models_config, sd_unet, sd_models_xl, cache from modules import paths, shared, modelloader, devices, script_callbacks, sd_vae, sd_disable_initialization, errors, hashes, sd_models_config, sd_unet, sd_models_xl, cache
from modules.sd_hijack_inpainting import do_inpainting_hijack
from modules.timer import Timer from modules.timer import Timer
import tomesd import tomesd
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment