From f7210db8675b92a328537ee2b42354995c16d39f Mon Sep 17 00:00:00 2001
From: Dirk Jahnke <dirk.jahnke@mailbox.org>
Date: Sat, 9 Jun 2018 18:53:20 +0200
Subject: [PATCH] Fix url

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index f340f8b..7b71d68 100755
--- a/README.md
+++ b/README.md
@@ -4,11 +4,7 @@ This is a fork of  https://github.com/mongoose-os-apps/LilyGo-HiGrow-Sensor-v1.g
 Added MQTT and power saving features.
 
 <p align="center">
-<<<<<<< HEAD
   <img src="raw/branch/master/LilyGO_HiGrow_Rev1_PhotoFrontHiGrow.jpg" width="60%">
-=======
-  <img src="src/commit/81771f0128582abb2d78c087dfc9f9e18709687f/LilyGO_HiGrow_Rev1_PhotoFrontHiGrow.jpg" width="60%">
->>>>>>> f2d8a6bd4d8e616986c098457889d866557164a3
 </p>
 
 ## Differences