From: Mark Otto <mark.otto@twitter.com>
Date: Sun, 11 Sep 2011 04:06:09 +0000 (-0700)
Subject: resolved conflict
X-Git-Tag: v1.3.0~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3407ed948d8454041f872d26e0c3e7752876147d;p=thirdparty%2Fbootstrap.git

resolved conflict
---

3407ed948d8454041f872d26e0c3e7752876147d
diff --cc bootstrap-1.3.0.css
index 220e498d68,64e4bc7039..8948246882
--- 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 20:34:52 PDT 2011
 - * Date: Sat Sep 10 19:00:49 PDT 2011
++ * Date: Sat Sep 10 21:06:02 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).