From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 18:54:17 +0000 (-0700)
Subject: resolve conflicts
X-Git-Tag: v1.2.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6638f87f5052cf9e1869e9811124daef1c6c1355;p=thirdparty%2Fbootstrap.git

resolve conflicts
---

6638f87f5052cf9e1869e9811124daef1c6c1355
diff --cc bootstrap-1.2.0.css
index 39007f130d,b96e4aab66..7b70173f7f
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.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: Fri Sep  2 11:52:53 PDT 2011
 - * Date: Fri Sep  2 11:49:21 PDT 2011
++ * Date: Fri Sep  2 11:54:09 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).