From 88bddbabc48b7aab0342498e39e2cb42e34556ee Mon Sep 17 00:00:00 2001
From: javi <qualopec@gmail.com>
Date: Mon, 16 Jun 2014 18:58:14 +0200
Subject: [PATCH] fixed makefile lowercase :(

---
 makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/makefile b/makefile
index f97f0b7..fb75236 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,6 @@
 #
 
 expresso = ./node_modules/.bin/mocha
-<<<<<<< HEAD
 docco = ./node_modules/.bin/docco
 uglify = ./node_modules/.bin/uglify