Merge branch 'main' of github.com:adieyal/comfyui-dynamicprompts

adieyal · Nov 10, 2023 · fe16603 · fe16603
2 parents 36383ae + 584b204
commit fe16603
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -19,11 +19,8 @@ Nodes can be found in the Dynamic Prompts menu:
 * [Dynamic Prompts Extension for Auto1111](https://github.com/adieyal/sd-dynamic-prompts)
 * [Tutorial](https://github.com/adieyal/sd-dynamic-prompts/blob/main/docs/tutorial.md)
 * [Online Resources](https://github.com/adieyal/sd-dynamic-prompts/blob/main/docs/resources.md)
-<<<<<<< HEAD
 * [CHANGELOG](./CHANGELOG.md)
-=======
 * [Stable Diffusion SDXL Wildcards and ComfyUI](https://ericri.medium.com/stable-diffusion-sdxl-wildcards-and-comfyui-e8483e00e1c)
->>>>>>> refs/rewritten/main
 
 ## Installation