From 75dffaabf88cf637f4e0a38cd042bca672bc71cd Mon Sep 17 00:00:00 2001
From: Maximilian Gerhardt <maximilian.gerhardt@rub.de>
Date: Wed, 13 Apr 2022 15:08:12 +0200
Subject: [PATCH] Update README.md

---
 examples/arduino-blink/README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/examples/arduino-blink/README.md b/examples/arduino-blink/README.md
index 1d46eff..6eb4be3 100644
--- a/examples/arduino-blink/README.md
+++ b/examples/arduino-blink/README.md
@@ -1,11 +1,7 @@
 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: