additional changes for merge conflict for #11337 (9043b916) · Commits · github_fork / Stable Diffusion Webui

modules/ui.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -934,13 +934,13 @@ def create_ui():
		inpaint_full_res,
		inpaint_full_res_padding,
		inpainting_mask_invert,
		img2img_batch_use_png_info,
		img2img_batch_png_info_props,
		img2img_batch_png_info_dir,
		img2img_batch_input_dir,
		img2img_batch_output_dir,
		img2img_batch_inpaint_mask_dir,
		override_settings,
		img2img_batch_use_png_info,
		img2img_batch_png_info_props,
		img2img_batch_png_info_dir,
		] + custom_inputs,
		outputs=[
		img2img_gallery,