resolved conflict

diff --cc bootstrap-1.3.0.css
index 220e498d68e436f179ef81e951b863ac3bc2fcc5,64e4bc703970ad6ea6f27b6df60b44eead643910..89482468824770fc620481a83e955e5eba874510
--- 1/bootstrap-1.3.0.css
--- 2/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).

diff --cc bootstrap-1.3.0.min.css
Simple merge

diff --cc docs/index.html
Simple merge

diff --cc docs/javascript.html
Simple merge