Permalink
Browse files

resolve conflicts again and rebuild

  • Loading branch information...
1 parent 23ec21d commit 5668723db24d4d3fd7015701ce5df5c1bdb58df1 @mdo mdo committed Aug 22, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 bootstrap-1.0.0.css
View
2 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).

0 comments on commit 5668723

Please sign in to comment.