fix for linux

diff --git a/Makefile b/Makefile
index 1f38338f8032f4ea6124a8d3c2c216b513824480..3d24eb1c52a43a4d749fe8befc6b4d436a3af179 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 eb7b65678392d9b41591c4563b9cf321b170a15d..333d6f04c0a0467af2921f2cc28a1a4a30b65e2c 100644 (file)
--- 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;