Update README.md

stanleyseow · Aug 5, 2014 · 0eff715 · 0eff715
1 parent 08da30d
commit 0eff715
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Arduino & Raspberry Pi driver for nRF24L01(+) 2.4GHz Wireless Transceiver
 
 Design Goals: 
@@ -26,8 +25,6 @@ Please refer to links :
 * [nRF24L01+ datasheet](http://www.nordicsemi.com/eng/nordic/download_resource/8765/2/27999719 )
 
 
-
-=======
 # Optimized High Speed Arduino driver for nRF24L01 2.4GHz Wireless Transceiver
 
 Design Goals: This library is designed to be...