From: Mark Otto <mark.otto@twitter.com>
Date: Sat, 10 Sep 2011 20:04:17 +0000 (-0700)
Subject: conflict
X-Git-Tag: v1.3.0~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c797cb61a6a36459b0c3e7b628e22ad3518350e8;p=thirdparty%2Fbootstrap.git

conflict
---

c797cb61a6a36459b0c3e7b628e22ad3518350e8
diff --cc bootstrap-1.3.0.css
index dbe1bdcfa3,f42e314a2e..9eef0b12aa
--- a/bootstrap-1.3.0.css
+++ b/bootstrap-1.3.0.css
@@@ -6,7 -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: Sat Sep 10 12:59:54 PDT 2011
 - * Date: Fri Sep  9 22:48:53 PDT 2011
++ * Date: Sat Sep 10 13:04:12 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).