File tree 2 files changed +9
-1
lines changed
2 files changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -73,4 +73,4 @@ void sendString(String stringToSend) {
73
73
if (lastSentChar != ' \n ' ) {
74
74
CloudSerial.write (' \n ' );
75
75
}
76
- }
76
+ }
Original file line number Diff line number Diff line change 15
15
a commercial license, send an email to license@arduino.cc.
16
16
*/
17
17
18
+ <<<<<<< HEAD
18
19
#include < ArduinoIoTCloud.h>
19
20
20
21
#ifdef BOARD_HAS_ECCX08
21
22
#include " utility/ECCX08Cert.h"
22
23
#include < ArduinoECCX08.h>
23
24
#endif
25
+ =======
26
+ #include < ArduinoECCX08.h>
27
+ #include " utility/ECCX08Cert.h"
28
+ #include " CloudSerial.h"
29
+ #include " ArduinoIoTCloud.h"
30
+ #include < Arduino_DebugUtils.h>
31
+ >>>>>>> Remove connection handling and debug messages because those tasks are now handled by ' Arduino_ConnectionHandler' and ' Arduino_DebugUtils'
24
32
25
33
#ifdef ARDUINO_ARCH_SAMD
26
34
#include < RTCZero.h>
You can’t perform that action at this time.
0 commit comments