Fix merge conflict

2022-04-12 19:40:50 +02:00
parent e920ef32c3 e08da697f0
commit 091af0ecd9
9 changed files with 34 additions and 27 deletions
--- a/examples/arduino-blink/README.md
+++ b/examples/arduino-blink/README.md
@@ -1,7 +1,11 @@
 How to build PlatformIO based project
 =====================================

+<<<<<<< HEAD
 1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
+=======
+1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html)
+>>>>>>> e08da697f0a750d5ebdd17d299d262b729e67c42
 2. Download [development platform with examples](https://github.com/platformio/platform-raspberrypi/archive/develop.zip)
 3. Extract ZIP archive
 4. Run these commands:
--- a/examples/arduino-blink/platformio.ini
+++ b/examples/arduino-blink/platformio.ini
@@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/page/projectconf.html
+; https://docs.platformio.org/page/projectconf.html

 [env]
 platform = raspberrypi