Update README.md

2015-03-07 15:04:42 +01:00 · 2015-03-07 15:04:42 +01:00 · c96c8d570a
parent 1c54cca234
commit c96c8d570a
1 changed files with 0 additions and 4 deletions
--- 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: