additional changes for merge conflict for #11337

9043b916 · AUTOMATIC1111 · b88645d9 · 9043b916
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

modules/ui.py modules/ui.py +3 -3

未找到文件。
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -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,