gitignore

esp8266-sensor.ino

@@ -94,10 +94,16 @@ IPAddress mqttBroker(10, 0, 4, 1);  //failsafe
 const int FW_VERSION = 10;
 const char* fwUrlBase = "http://10.0.4.2/fota/";
 /************************* MQTT Broker Setup *********************************/
+<<<<<<< HEAD
 #define name "test"
 //see secrets.h
 char MQTT_CLIENTID[10];
 const char  MQTT_WILL_TOPIC[] = "test/sys/will";
+=======
+#define name "bathroom"
+char MQTT_CLIENTID[10];
+const char  MQTT_WILL_TOPIC[] = "bathroom/sys/will";
+>>>>>>> gitignore
 const int  MQTT_WILL_QOS = 0;
 const int  MQTT_WILL_RETAIN = 0;
 const char MQTT_WILL_MESSAGE[] = "Finally died...";