Fix merge conflict

This commit is contained in:
unknown
2022-04-12 19:40:50 +02:00
9 changed files with 34 additions and 27 deletions

View File

@ -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: