aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-28 14:51:14 -0800
committerMark Otto <[email protected]>2012-01-28 14:51:14 -0800
commitdc74530fba5ba8fee19da7e53ad324718ac07a46 (patch)
treeb72cc91c76f8e99cdc9879be162eb6e11180a48e
parent7843a665fdc18c1199766d6c65f192209ec35741 (diff)
parent29b1e86bf967e1cfbf869c0eed1a46655d8db126 (diff)
downloadbootstrap-dc74530fba5ba8fee19da7e53ad324718ac07a46.tar.xz
bootstrap-dc74530fba5ba8fee19da7e53ad324718ac07a46.zip
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 879d59440..399b57c6e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ BOOTSTRAP_LESS = ./less/bootstrap.less
BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
LESS_COMPRESSOR ?= `which lessc`
-UGLIFY_JS ?= `which uglifyjs`
WATCHR ?= `which watchr`
#