aboutsummaryrefslogtreecommitdiff
path: root/lib/reset.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-11-29 22:35:58 -0800
committerMark Otto <[email protected]>2011-11-29 22:35:58 -0800
commitcbb291b8ab316c3c0103da3c7b7a2c73596cfef2 (patch)
treee632dc37d1f3dda4e91a06d4f671313a7e476187 /lib/reset.less
parentb36df463108e2e4df8c389a06f577823564788d9 (diff)
parent08d0aff19f8ad8fa2a9cfa389b8753c4525ea99c (diff)
downloadbootstrap-cbb291b8ab316c3c0103da3c7b7a2c73596cfef2.tar.xz
bootstrap-cbb291b8ab316c3c0103da3c7b7a2c73596cfef2.zip
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts: bootstrap.css bootstrap.min.css
Diffstat (limited to 'lib/reset.less')
-rw-r--r--lib/reset.less8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/reset.less b/lib/reset.less
index 8bff57335..c95c7b04c 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -1,6 +1,8 @@
-/* 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).
- * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
+// 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).
+// ------------------------------------------------------------------------
// ERIC MEYER RESET