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

---
 README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 81c96d3..5835be4 100644
--- a/README
+++ b/README
@@ -7,9 +7,9 @@ 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!**
+and fitPointDist parameter!