fixing conflict and recompiling

diff --cc bootstrap.css
index 16bfefdb2851d7276257c3bdc938d676bcca6591,a7adebc69319ada557759a04dd8f601527bb94c3..bcba5b4574689356318cb91891e6d259f2c1a9ac
--- 1/bootstrap-1.3.0.css
--- 2/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).

diff --cc bootstrap.min.css
Simple merge

diff --cc docs/assets/css/docs.css
Simple merge

diff --cc docs/index.html
Simple merge

diff --cc examples/fluid.html
Simple merge

diff --cc lib/forms.less
Simple merge