Update README.md

10 years ago · 54ff2e0159
parent 426461b3c8
commit 54ff2e0159
1 changed files with 0 additions and 4 deletions
--- 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