From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 16 Sep 2011 16:47:36 +0000 (-0700)
Subject: fixing conflict and recompiling
X-Git-Tag: v1.3.0~3^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ff18a9ffc9171977e58ecb517cad677ba1727b6;p=thirdparty%2Fbootstrap.git

fixing conflict and recompiling
---

8ff18a9ffc9171977e58ecb517cad677ba1727b6
diff --cc bootstrap.css
index 16bfefdb28,a7adebc693..bcba5b4574
--- a/bootstrap.css
+++ b/bootstrap.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 15 09:29:41 PDT 2011
 - * Date: Thu Sep 15 23:09:33 PDT 2011
++ * Date: Fri Sep 16 09:47:29 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).