diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-08 12:14:24 +0000 |
|---|---|---|
| committer | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-08 12:14:24 +0000 |
| commit | 9043b91649f35adaa732d811184e81afb7a34b71 (patch) | |
| tree | d7362f587afef83f28624b4f552e1c5f78be0ddf /modules/ui.py | |
| parent | b88645d9ebddfa26aaf6ee25519a95c967a23138 (diff) | |
| download | stable-diffusion-webui-gfx803-9043b91649f35adaa732d811184e81afb7a34b71.tar.gz stable-diffusion-webui-gfx803-9043b91649f35adaa732d811184e81afb7a34b71.tar.bz2 stable-diffusion-webui-gfx803-9043b91649f35adaa732d811184e81afb7a34b71.zip | |
additional changes for merge conflict for #11337
Diffstat (limited to 'modules/ui.py')
| -rw-r--r-- | modules/ui.py | 6 |
1 files 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,
|