aboutsummaryrefslogtreecommitdiff
path: root/bootstrap-1.0.0.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-08-21 20:56:06 -0700
committerMark Otto <[email protected]>2011-08-21 20:56:06 -0700
commitf169c99f726c250f0bb2f68ea4eedaaf3fbe15c0 (patch)
treef182f5017e0427f7787905a2c7fce1669eb2df81 /bootstrap-1.0.0.css
parent0df17f06d8cb94ccee42cd5c8536965c2df7e643 (diff)
downloadbootstrap-f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0.tar.xz
bootstrap-f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0.zip
more tweaks to resolve some missed conflicts
Diffstat (limited to 'bootstrap-1.0.0.css')
-rw-r--r--bootstrap-1.0.0.css2
1 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css
index 4ee29652c..6cf9f7bb7 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:53:42 PDT 2011
+ * Date: Sun Aug 21 20:55:56 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).