Fix merge-introduced conflict.

aentinger · aentinger · commit ff955e9a182d · 2022-11-10T09:47:24.000+01:00
diff --git a/src/JSONVar.cpp b/src/JSONVar.cpp
@@ -202,11 +202,6 @@ JSONVar::operator unsigned long () const
     return cJSON_IsNumber (_json) ? _json->valueint : 0;
 }
 
-JSONVar::operator unsigned long() const
-{
-  return cJSON_IsNumber(_json) ? _json->valueint : 0;
-}
-
 JSONVar::operator double() const
 {
   return cJSON_IsNumber(_json) ? _json->valuedouble : NAN;

Original file line number	Diff line number	Diff line change
`@@ -202,11 +202,6 @@ JSONVar::operator unsigned long () const`
`202`	`202`	`return cJSON_IsNumber (_json) ? _json->valueint : 0;`
`203`	`203`	`}`
`204`	`204`
`205`		`-JSONVar::operator unsigned long() const`
`206`		`-{`
`207`		`- return cJSON_IsNumber(_json) ? _json->valueint : 0;`
`208`		`-}`
`209`		`-`
`210`	`205`	`JSONVar::operator double() const`
`211`	`206`	`{`
`212`	`207`	`return cJSON_IsNumber(_json) ? _json->valuedouble : NAN;`