resolve conflict

diff --cc bootstrap-1.3.0.css
index 1a924b7b33b57a586ba89155544688266bbc143c,762b4a53b1f25df11b6f618205cc8aa4a3933b6f..d416026ac81ad0a696cb161eec3f64b946740904
--- 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: Mon Sep 12 19:00:16 PDT 2011
 - * Date: Mon Sep 12 14:29:06 PDT 2011
++ * Date: Mon Sep 12 19:00:52 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).