From 5668723db24d4d3fd7015701ce5df5c1bdb58df1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2011 20:51:25 -0700 Subject: [PATCH] resolve conflicts again and rebuild --- bootstrap-1.0.0.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 08bbb7bba8..88537a9614 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.css @@ -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: Sun Aug 21 20:50:48 PDT 2011 + * Date: Sun Aug 21 20:51:15 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).