resolve conflict

diff --cc bootstrap-1.3.0.css
index 247d94d2cdda94731aac461830375e239d54e594,c9fc91c494afa715f5749076a72ac1f36c8d3de9..25bffa3af918fa141e4fdfc3734c7149a5b924a7
--- 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: Thu Sep  8 22:56:41 PDT 2011
 - * Date: Thu Sep  8 20:00:20 PDT 2011
++ * Date: Thu Sep  8 23:02:03 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 lib/patterns.less
Simple merge