From: Mark Otto <mark.otto@twitter.com>
Date: Tue, 13 Sep 2011 02:00:59 +0000 (-0700)
Subject: resolve conflict
X-Git-Tag: v1.3.0~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=218976a7d8a3b2b39363bf939cf914250c0c9930;p=thirdparty%2Fbootstrap.git

resolve conflict
---

218976a7d8a3b2b39363bf939cf914250c0c9930
diff --cc bootstrap-1.3.0.css
index 1a924b7b33,762b4a53b1..d416026ac8
--- 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: Mon Sep 12 19:00:16 PDT 2011
 - * Date: Mon Sep 12 14:29:06 PDT 2011
++ * Date: Mon Sep 12 19:00:52 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).