From 0de7d02a3d9293253f27b1f868db5789ec932fd9 Mon Sep 17 00:00:00 2001
From: Nicholas Van Doorn <vandoorn.nick@gmail.com>
Date: Thu, 15 Nov 2018 13:09:19 -0800
Subject: Update readme.md

Co-Authored-By: dragonprevost <dragon@dkp.io>
---
 readme.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/readme.md b/readme.md
index 1075fd1..d9f83da 100644
--- a/readme.md
+++ b/readme.md
@@ -46,7 +46,6 @@ requires:
 ...
 ```
 
-<<<<<<< HEAD
 ## Example 
 For getting the current acceleration
 ```
-- 
cgit v1.2.3