Update markdown-editpreview-ng.js

codemwnci · Sep 14, 2014 · 82cdca1 · 82cdca1
1 parent 05e26be
commit 82cdca1
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/lib/codemwnci/markdown-editpreview-ng.js b/lib/codemwnci/markdown-editpreview-ng.js
@@ -47,12 +47,7 @@
       restrict: 'A',
       replace: false,
       link: function(scope, element, attrs) {  
-<<<<<<< HEAD
       	element.markdown({hiddenButtons: 'cmdPreview'});
-=======
-      	attrs.$set('data-provide', 'markdown');
-      	attrs.$set('data-hiddenButtons', 'cmdPreview');
->>>>>>> FETCH_HEAD
       },
     };
   }])