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

resolve conflict
---

1a8fb2dbf76b19c899ff8ae73a87c3727c1113cf
diff --cc bootstrap-1.3.0.css
index 247d94d2cd,c9fc91c494..25bffa3af9
--- 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: Thu Sep  8 22:56:41 PDT 2011
 - * Date: Thu Sep  8 20:00:20 PDT 2011
++ * Date: Thu Sep  8 23:02:03 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).