Fixed Makefile after merge
This commit is contained in:
parent
2b1b6055fc
commit
dee0a46c08
6
Makefile
6
Makefile
|
@ -1,9 +1,6 @@
|
||||||
CASK ?= cask
|
CASK ?= cask
|
||||||
EMACS ?= emacs
|
EMACS ?= emacs
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
CASK_DIR ?= `${CASK} package-directory`
|
CASK_DIR ?= `${CASK} package-directory`
|
||||||
>>>>>>> develop
|
|
||||||
|
|
||||||
all: test
|
all: test
|
||||||
|
|
||||||
|
@ -19,11 +16,8 @@ unit:
|
||||||
install:
|
install:
|
||||||
${CASK} install
|
${CASK} install
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
clean:
|
clean:
|
||||||
rm -Rf .emacs.d
|
rm -Rf .emacs.d
|
||||||
rm -Rf .cask
|
rm -Rf .cask
|
||||||
|
|
||||||
>>>>>>> develop
|
|
||||||
.PHONY: all test unit ecukes install
|
.PHONY: all test unit ecukes install
|
||||||
|
|
Loading…
Reference in New Issue