resolve conflict

sokil · Jan 12, 2018 · e9701d9 · e9701d9
2 parents d352e76 + 295cfd1
commit e9701d9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -13,8 +13,8 @@ build: check_box_installed
 	box build -v
 
 dev:
-	composer.phar update --no-dev -o
+	composer.phar update -o
 
 clean:
 	rm -rf ./vendor
-	rm -rf ./build
+	rm -rf ./build