Trying conflict solve

mcmchris · mcmchris · commit de55dcb8a6f9 · 2024-01-31T10:15:02.000-04:00
diff --git a/content/hardware/04.pro/boards/portenta-h7/tutorials/over-the-air-update/content.md b/content/hardware/04.pro/boards/portenta-h7/tutorials/over-the-air-update/content.md
@@ -247,7 +247,7 @@ The complete script is as follows.
 static char const SSID[] = SSID_NAME;  /* your network SSID (name) */
 static char const PASS[] = SSID_PASS;  /* your network password (use for WPA, or use as key for WEP) */
 
-static char const OTA_FILE_LOCATION[] = "http://downloads.arduino.cc/ota/OTA_Usage_Portenta.ino.PORTENTA_H7_M7.ota";
+static char const OTA_FILE_LOCATION[] = "https://downloads.arduino.cc/ota/OTA_Usage_Portenta.ino.PORTENTA_H7_M7.ota";
 
 void setup()
 {
@@ -345,7 +345,7 @@ void loop()
 static char const SSID[] = SSID_NAME;  /* your network SSID (name) */
 static char const PASS[] = SSID_PASS;  /* your network password (use for WPA, or use as key for WEP) */
 
-static char const OTA_FILE_LOCATION[] = "http://downloads.arduino.cc/ota/OTA_Usage_Portenta.ino.PORTENTA_H7_M7.ota";
+static char const OTA_FILE_LOCATION[] = "https://downloads.arduino.cc/ota/OTA_Usage_Portenta.ino.PORTENTA_H7_M7.ota";
 
 void setup()
 {

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ The complete script is as follows.`
`247`	`247`	`static char const SSID[] = SSID_NAME; /* your network SSID (name) */`
`248`	`248`	`static char const PASS[] = SSID_PASS; /* your network password (use for WPA, or use as key for WEP) */`
`249`	`249`
`250`		`-static char const OTA_FILE_LOCATION[] = "http://downloads.arduino.cc/ota/OTA_Usage_Portenta.ino.PORTENTA_H7_M7.ota";`
	`250`	`+static char const OTA_FILE_LOCATION[] = "https://downloads.arduino.cc/ota/OTA_Usage_Portenta.ino.PORTENTA_H7_M7.ota";`
`251`	`251`
`252`	`252`	`void setup()`
`253`	`253`	`{`
`@@ -345,7 +345,7 @@ void loop()`
`345`	`345`	`static char const SSID[] = SSID_NAME; /* your network SSID (name) */`
`346`	`346`	`static char const PASS[] = SSID_PASS; /* your network password (use for WPA, or use as key for WEP) */`
`347`	`347`
`348`		`-static char const OTA_FILE_LOCATION[] = "http://downloads.arduino.cc/ota/OTA_Usage_Portenta.ino.PORTENTA_H7_M7.ota";`
	`348`	`+static char const OTA_FILE_LOCATION[] = "https://downloads.arduino.cc/ota/OTA_Usage_Portenta.ino.PORTENTA_H7_M7.ota";`
`349`	`349`
`350`	`350`	`void setup()`
`351`	`351`	`{`