repair merge error (390bffa8) · Commits · github_fork / Stable Diffusion Webui

modules/sd_models.py

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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