From c8e01859219d888dbab300f71061929ff8d488aa Mon Sep 17 00:00:00 2001
From: FizzleDorf <1fizzledorf@gmail.com>
Date: Thu, 30 Mar 2023 23:02:09 -0400
Subject: [PATCH] back to where I'm at

---
 .vs/ComfyUI/v17/.suo                | Bin 29696 -> 29696 bytes
 web/extensions/core/widgetInputs.js |   8 --------
 web/scripts/widgets.js              |   4 ----
 3 files changed, 12 deletions(-)

diff --git a/.vs/ComfyUI/v17/.suo b/.vs/ComfyUI/v17/.suo
index d493b9bddf78de7f03a9f73e13726262ed7611c5..69729b9303ca1b45e4ae5a38c59d68ddb21fab85 100644
GIT binary patch
delta 198
zcmZp8!PxMEaYGIhYs2E_6RI{BGW}*|O_*^U#AIWaX4KzYsVL0KGoPhX*U>2KiHDZG
z)8rmCiOn0-0t6ZLCo@{;F>ar1U{N?(&;8zJeTx*P&5x~vnUKVC>|b+={$W4>MMee&
zRv^~}sN9Tk^CB-HMlltHG=l|@Z4HuN1~j*F@_oxKlfV1?6BK7gsPO=@T{kQEMaY8O
Im)*_*0C(*+!vFvP

delta 256
zcmZp8!PxMEaYGIh>jUAXuPQeeGW}*|4fx&+VzRMIGm37mR1{`alnCznzo{?5&_m1K
ziS5Bn&Kc_pwz~t_^I1A|9gV`Ccx+y)7A(jpI+@Wzk8#yxLkFwLAFS*rdF|P})k=?%
zaXVDRd~&{r{Nw```!_$f4rW4C*k=ElQ;Y!#NCMexK<olHZ<E(KMnQSF5|#rNK(@l>
p``!jj+M3KTah3y4K(;H8%LBx4VX!nOkjuVV!7oA<<g@H{4gmk-M{EE9

diff --git a/web/extensions/core/widgetInputs.js b/web/extensions/core/widgetInputs.js
index 37cd3fa05..8343726f1 100644
--- a/web/extensions/core/widgetInputs.js
+++ b/web/extensions/core/widgetInputs.js
@@ -288,18 +288,10 @@ app.registerExtension({
 						widget.value = theirWidget.value;
 					}
 				}
-
-<<<<<<< HEAD
 				if (widget.type === "combo") {
 					addSeedControlWidget(this, widget, "randomize");
                 }
-					
-=======
-				if (widget.type === "combo")
-					addSeedControlWidget(this, widget, "randomize");
-				
 
->>>>>>> fbe3df1ec837d298aaab68bab81c967182d2bab6
 				// When our value changes, update other widgets to reflect our changes
 				// e.g. so LoadImage shows correct image
 				const callback = widget.callback;
diff --git a/web/scripts/widgets.js b/web/scripts/widgets.js
index ee58c0815..c073f365e 100644
--- a/web/scripts/widgets.js
+++ b/web/scripts/widgets.js
@@ -54,11 +54,7 @@ export function addSeedControlWidget(node, targetWidget, defaultValue = "randomi
 }
 
 function seedWidget(node, inputName, inputData) {
-<<<<<<< HEAD
-	const seed = ComfyWidgets.COMBO(node, inputName, inputData);
-=======
 	const seed = ComfyWidgets.INT(node, inputName, inputData);
->>>>>>> fbe3df1ec837d298aaab68bab81c967182d2bab6
 	const seedControl = addSeedControlWidget(node, seed.widget, "randomize");
 
 	seed.widget.linkedWidgets = [seedControl];