- Fix even more merge conflicts.

aerlon · aerlon · commit 1dcd4c4a7b98 · 2020-03-05T15:39:49.000+01:00
diff --git a/libraries/ESP8266WiFiMesh/src/ESP8266WiFiMesh.cpp b/libraries/ESP8266WiFiMesh/src/ESP8266WiFiMesh.cpp
@@ -76,7 +76,7 @@ ESP8266WiFiMesh::ESP8266WiFiMesh(ESP8266WiFiMesh::requestHandlerType requestHand
                                  const String &nodeID, bool verboseMode, uint8 meshWiFiChannel, uint16_t serverPort) 
                                  : _server(serverPort)
 {  
-  updateNetworkNames(meshName, (nodeID != "" ? nodeID : TypeCast::uint64ToString(ESP.getChipId())));
+  updateNetworkNames(meshName, (!nodeID.isEmpty() ? nodeID : TypeCast::uint64ToString(ESP.getChipId())));
   _requestHandler = requestHandler;
   _responseHandler = responseHandler;
   setWiFiChannel(meshWiFiChannel);

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ ESP8266WiFiMesh::ESP8266WiFiMesh(ESP8266WiFiMesh::requestHandlerType requestHand`
`76`	`76`	`const String &nodeID, bool verboseMode, uint8 meshWiFiChannel, uint16_t serverPort)`
`77`	`77`	`: _server(serverPort)`
`78`	`78`	`{`
`79`		`- updateNetworkNames(meshName, (nodeID != "" ? nodeID : TypeCast::uint64ToString(ESP.getChipId())));`
	`79`	`+ updateNetworkNames(meshName, (!nodeID.isEmpty() ? nodeID : TypeCast::uint64ToString(ESP.getChipId())));`
`80`	`80`	`_requestHandler = requestHandler;`
`81`	`81`	`_responseHandler = responseHandler;`
`82`	`82`	`setWiFiChannel(meshWiFiChannel);`