From c96c8d570a1c710853e58d737172e6d72185ee4d Mon Sep 17 00:00:00 2001
From: Francesco Truzzi <squeck94@gmail.com>
Date: Sat, 7 Mar 2015 15:04:42 +0100
Subject: [PATCH] Update README.md

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

diff --git a/lua_modules/hdc1000/README.md b/lua_modules/hdc1000/README.md
index bd57b86e..aa04897d 100644
--- a/lua_modules/hdc1000/README.md
+++ b/lua_modules/hdc1000/README.md
@@ -10,15 +10,11 @@ First, require it:
 
 Then, initialize it:
 
-<<<<<<< HEAD
 `HDC1000.init(sda, scl, drdyn)`
 
 If you don't want to use the DRDYn pin, set it to false: a 20ms delay will be automatically set after each read request.
 
 `HDC1000.init(sda, scl, false)`
-=======
-`HDC1000.init(sda, scl)`
->>>>>>> origin/master
 
 Configure it: