From 48dc89cf13b80da877493a424f0361babe02e9bb Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Wed, 1 Feb 2023 15:55:44 +0100
Subject: [PATCH] Fix merge conflict (apply changes from 901ce23)

---
 wled00/data/settings_leds.htm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index a91b9bca..a9fbce19 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -9,7 +9,7 @@
 		var d=document,laprev=55,maxB=1,maxV=0,maxM=4000,maxPB=4096,maxL=1333,maxLbquot=0; //maximum bytes for LED allocation: 4kB for 8266, 32kB for 32
 		d.um_p = [];
 		d.rsvd = [];
-		d.ro_pins = [];
+		d.ro_gpio = [];
 		d.max_gpio = 39;
 		var customStarts=false,startsDirty=[],maxCOOverrides=5;
 		var loc = false, locip;
@@ -65,7 +65,7 @@
 						for (k=0;k<d.rsvd.length;k++) p.push(d.rsvd[k]); // fill with reservations
 						for (k=0;k<d.um_p.length;k++) p.push(d.um_p[k]); // fill with usermod pins
 						if (p.some((e)=>e==parseInt(LCs[i].value,10))) {alert(`Sorry, pins ${JSON.stringify(p)} can't be used.`);LCs[i].value="";LCs[i].focus();return false;}
-						else if (!(nm == "IR" || nm=="BT") && d.ro_pins.some((e)=>e==parseInt(LCs[i].value,10))) {alert(`Sorry, pins ${JSON.stringify(d.ro_gpio)} are input only.`);LCs[i].value="";LCs[i].focus();return false;}
+						else if (!(nm == "IR" || nm=="BT") && d.ro_gpio.some((e)=>e==parseInt(LCs[i].value,10))) {alert(`Sorry, pins ${JSON.stringify(d.ro_gpio)} are input only.`);LCs[i].value="";LCs[i].focus();return false;}
 						for (j=i+1; j<LCs.length; j++)
 						{
 							var n2 = LCs[j].name.substring(0,2);