Fixed Makefile after merge

This commit is contained in:
Carlo Sciolla 2017-08-19 21:33:34 +02:00
parent 2b1b6055fc
commit dee0a46c08
No known key found for this signature in database
GPG Key ID: BA5D71E6F3C580C1
1 changed files with 0 additions and 6 deletions

View File

@ -1,9 +1,6 @@
CASK ?= cask
EMACS ?= emacs
<<<<<<< HEAD
=======
CASK_DIR ?= `${CASK} package-directory`
>>>>>>> develop
all: test
@ -19,11 +16,8 @@ unit:
install:
${CASK} install
<<<<<<< HEAD
=======
clean:
rm -Rf .emacs.d
rm -Rf .cask
>>>>>>> develop
.PHONY: all test unit ecukes install