From 54ff2e0159c52f822d771fa9604a077f0df766d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Dematt=C3=A9?= <github@dematte.at>
Date: Fri, 10 Oct 2014 23:51:31 +0200
Subject: [PATCH] Update README.md

---
 javascript_implementation/README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/javascript_implementation/README.md b/javascript_implementation/README.md
index 7761947..b7e1c65 100644
--- a/javascript_implementation/README.md
+++ b/javascript_implementation/README.md
@@ -15,11 +15,7 @@ See **demo** at [dematte.at/cpn/javaScript_implementation](http://dematte.at/cpn
         klass: window.ColorPicker,
         input: elm,
         patch: elm,
-<<<<<<< HEAD
         init: function(elm, colors){}, // initialization callback (before colorPicker gets initialized though)
-=======
-        init: function(elm){}, // initialization callback (before colorPicker gets initialized though)
->>>>>>> FETCH_HEAD
         // animationSpeed: 200, will be supported soon
         // draggable: true,
         multipleInstances: false