From 886274f646c26440de5f642e7104e22d35f7fc98 Mon Sep 17 00:00:00 2001
From: Michael <michael.zinsmaier@googlemail.com>
Date: Sat, 24 May 2014 15:47:57 +0200
Subject: [PATCH] Update README

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 5835be4..43f88a3 100644
--- a/README
+++ b/README
@@ -7,7 +7,7 @@ Feel free to add additional features and correct errors.
 Regards Michael
 
 
-<<<<<<Update>>>>>
+Update
 added tests/Issue18.htm with a better explanation of the curvePointFactor
 and fitPointDist parameter!