diff options
| author | Mark Otto <[email protected]> | 2011-09-16 09:47:36 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-16 09:47:36 -0700 |
| commit | 8ff18a9ffc9171977e58ecb517cad677ba1727b6 (patch) | |
| tree | 4b9149269be92fdc07e373eb5216068ae5df7ce6 /Makefile | |
| parent | b188c0da8b51cd18d6fa3fa958e823a318ba5f10 (diff) | |
| parent | d1b594db7a7307efd7de29a2875046166c69a76f (diff) | |
| download | bootstrap-8ff18a9ffc9171977e58ecb517cad677ba1727b6.tar.xz bootstrap-8ff18a9ffc9171977e58ecb517cad677ba1727b6.zip | |
fixing conflict and recompiling
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,6 +1,6 @@ DATE=$(shell DATE) -BOOTSTRAP = ./bootstrap-1.3.0.css -BOOTSTRAP_MIN = ./bootstrap-1.3.0.min.css +BOOTSTRAP = ./bootstrap.css +BOOTSTRAP_MIN = ./bootstrap.min.css BOOTSTRAP_LESS = ./lib/bootstrap.less LESS_COMPESSOR ?= `which lessc` WATCHR ?= `which watchr` |