diff options
| author | Mark Otto <[email protected]> | 2011-06-28 14:30:48 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-06-28 14:30:48 -0700 |
| commit | 01c5e74bb3a351feb0c83ff14fb22244647eb82b (patch) | |
| tree | 1d72cf2f382060bc552151dbfe2df1b2647f0d73 /lib/reset.less | |
| parent | 5949b8e14559464539541ee02f6af4fc2cfe1cbf (diff) | |
| parent | e91a74e8e89240d061478326ad26bd4ffa9ce910 (diff) | |
| download | bootstrap-01c5e74bb3a351feb0c83ff14fb22244647eb82b.tar.xz bootstrap-01c5e74bb3a351feb0c83ff14fb22244647eb82b.zip | |
resolve conflict
Diffstat (limited to 'lib/reset.less')
| -rw-r--r-- | lib/reset.less | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/reset.less b/lib/reset.less index 040177b11..0a3901b4d 100644 --- a/lib/reset.less +++ b/lib/reset.less @@ -1,7 +1,7 @@ /* - Global Reset - 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 html, body { margin: 0; padding: 0; } @@ -9,7 +9,7 @@ h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, cod table { border-collapse: collapse; border-spacing: 0; } ol, ul { list-style: none; } q:before, q:after, blockquote:before, blockquote:after { content: ""; } - + // HTML5 header, section, |