diff options
| author | Jacob Thornton <[email protected]> | 2011-12-24 22:31:39 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-12-24 22:31:39 -0800 |
| commit | 076370f3f9076b177a1f9c8ba9f536faa1a58957 (patch) | |
| tree | 3f2c4c77667d1a666384123b5608187fe8c5508d | |
| parent | 04fee21121473606b425007f0d5cfd7853b1460b (diff) | |
| download | bootstrap-076370f3f9076b177a1f9c8ba9f536faa1a58957.tar.xz bootstrap-076370f3f9076b177a1f9c8ba9f536faa1a58957.zip | |
fix for linux
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | bootstrap.css | 6 |
2 files changed, 2 insertions, 7 deletions
@@ -1,5 +1,4 @@ VERSION=2.0.0 -DATE=$(shell DATE) BOOTSTRAP = ./bootstrap.css BOOTSTRAP_MIN = ./bootstrap.min.css BOOTSTRAP_LESS = ./lib/bootstrap.less @@ -9,7 +8,7 @@ WATCHR ?= `which watchr` build: @@if test ! -z ${LESS_COMPESSOR}; then \ - sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"${DATE}"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \ + sed -e 's/@VERSION/'"v${VERSION}"'/' -e '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; \ diff --git a/bootstrap.css b/bootstrap.css index eb7b65678..333d6f04c 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,11 +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. -<<<<<<< HEAD - * Date: Thu Dec 22 19:09:49 PST 2011 -======= - * Date: Wed Dec 21 18:38:56 CST 2011 ->>>>>>> 9fb380151d477f1741b7609ade7a9e7fd5450b2c + * Date: Sat Dec 24 22:30:43 PST 2011 */ html, body { margin: 0; |