resolve conflicts

diff --cc bootstrap-1.2.0.css
index 39007f130df1e11ad3ace771a661bba71dbb9145,b96e4aab66455686cacc94c1b9022365f62a1e33..7b70173f7f5f81af4c89ac441231734851d70e61
--- 1/bootstrap-1.2.0.css
--- 2/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.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: Fri Sep  2 11:52:53 PDT 2011
 - * Date: Fri Sep  2 11:49:21 PDT 2011
++ * Date: Fri Sep  2 11:54:09 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.2.0.min.css
Simple merge