additional changes for merge conflict for #11337
This commit is contained in:
parent
b88645d9eb
commit
9043b91649
@ -934,13 +934,13 @@ def create_ui():
|
|||||||
inpaint_full_res,
|
inpaint_full_res,
|
||||||
inpaint_full_res_padding,
|
inpaint_full_res_padding,
|
||||||
inpainting_mask_invert,
|
inpainting_mask_invert,
|
||||||
img2img_batch_use_png_info,
|
|
||||||
img2img_batch_png_info_props,
|
|
||||||
img2img_batch_png_info_dir,
|
|
||||||
img2img_batch_input_dir,
|
img2img_batch_input_dir,
|
||||||
img2img_batch_output_dir,
|
img2img_batch_output_dir,
|
||||||
img2img_batch_inpaint_mask_dir,
|
img2img_batch_inpaint_mask_dir,
|
||||||
override_settings,
|
override_settings,
|
||||||
|
img2img_batch_use_png_info,
|
||||||
|
img2img_batch_png_info_props,
|
||||||
|
img2img_batch_png_info_dir,
|
||||||
] + custom_inputs,
|
] + custom_inputs,
|
||||||
outputs=[
|
outputs=[
|
||||||
img2img_gallery,
|
img2img_gallery,
|
||||||
|
Loading…
Reference in New Issue
Block a user