diff --git a/arduino/LoraNFC/sketch_may24a/sketch_may24a.ino b/arduino/LoraNFC/sketch_may24a/sketch_may24a.ino index 8f2b830..5b4dcf4 100644 --- a/arduino/LoraNFC/sketch_may24a/sketch_may24a.ino +++ b/arduino/LoraNFC/sketch_may24a/sketch_may24a.ino @@ -45,7 +45,11 @@ void sendLoRaData(String data) Serial.println(data); LoRa.beginPacket(); +<<<<<<< HEAD LoRa.print("node3 " + data); +======= + LoRa.print(data); +>>>>>>> 26fbc8fed3644b1eef44268b84d09fc87be556a3 LoRa.endPacket(); }