me la pela

hardware/include/main.hpp

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #include <Arduino.h>
 
 #include "json.hpp"
@@ -9,4 +10,14 @@
 #define LED 2
 #define SERVER_IP "192.168.1.178"
 #define REST_PORT 80
-#define MQTT_PORT 1883
+#define MQTT_PORT 1883
+=======
+#include <Arduino.h>
+
+#include "JsonTools.hpp"
+#include "RestClient.hpp"
+#include "WifiConnection.hpp"
+#include "MqttClient.hpp"
+
+uint32_t getChipID();
+>>>>>>> main