From 9043b91649f35adaa732d811184e81afb7a34b71 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 8 Jul 2023 15:14:24 +0300
Subject: [PATCH] additional changes for merge conflict for #11337

---
 modules/ui.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/ui.py b/modules/ui.py
index c752a64d..e83f2651 100644
--- 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,