From: Mark Otto <mark.otto@twitter.com>
Date: Mon, 22 Aug 2011 03:51:25 +0000 (-0700)
Subject: resolve conflicts again and rebuild
X-Git-Tag: v1.1.0~13^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5668723db24d4d3fd7015701ce5df5c1bdb58df1;p=thirdparty%2Fbootstrap.git

resolve conflicts again and rebuild
---

diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css
index 08bbb7bba8..88537a9614 100644
--- a/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.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: Sun Aug 21 20:50:48 PDT 2011
+ * Date: Sun Aug 21 20:51:15 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).