diff options
| author | Mark Otto <[email protected]> | 2011-09-12 19:00:59 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-12 19:00:59 -0700 |
| commit | 218976a7d8a3b2b39363bf939cf914250c0c9930 (patch) | |
| tree | f36b0e7aa1937ef1081d357c2028d6a56ee67854 | |
| parent | 3f64aaf82b6b3486c1b2e98e19047089fdfc331b (diff) | |
| parent | 4c5320b18fb24356553dc14e13db69883797d105 (diff) | |
| download | bootstrap-218976a7d8a3b2b39363bf939cf914250c0c9930.tar.xz bootstrap-218976a7d8a3b2b39363bf939cf914250c0c9930.zip | |
resolve conflict
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | bootstrap-1.3.0.css | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -7,10 +7,10 @@ WATCHR ?= `which watchr` build: @@if test ! -z ${LESS_COMPESSOR}; then \ - sed 's/@DATE/'"${DATE}"'/' ${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \ - lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \ - lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \ - rm -f ${BOOTSTRAP_LESS}.tmp; \ + sed 's/@DATE/'"${DATE}"'/' ${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp && \ + lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP} && \ + lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress && \ + rm -f ${BOOTSTRAP_LESS}.tmp && \ echo "Bootstrap successfully built! - `date`"; \ else \ echo "You must have the LESS compiler installed in order to build Bootstrap."; \ diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index 1a924b7b3..d416026ac 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Mon Sep 12 19:00:16 PDT 2011 + * Date: Mon Sep 12 19:00:52 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). |