fixed makefile

10 years ago · b83d9c4037
parent 678157b478
commit b83d9c4037
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@ -3,7 +3,6 @@
 #

 expresso = ./node_modules/.bin/mocha
-<<<<<<< HEAD
 docco = ./node_modules/.bin/docco
 uglify = ./node_modules/.bin/uglify