diff options
| author | Mark Otto <[email protected]> | 2011-11-29 22:35:58 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-11-29 22:35:58 -0800 |
| commit | cbb291b8ab316c3c0103da3c7b7a2c73596cfef2 (patch) | |
| tree | e632dc37d1f3dda4e91a06d4f671313a7e476187 /lib/type.less | |
| parent | b36df463108e2e4df8c389a06f577823564788d9 (diff) | |
| parent | 08d0aff19f8ad8fa2a9cfa389b8753c4525ea99c (diff) | |
| download | bootstrap-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/type.less')
| -rw-r--r-- | lib/type.less | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/type.less b/lib/type.less index 8e25fd9c5..407a20ec2 100644 --- a/lib/type.less +++ b/lib/type.less @@ -1,6 +1,6 @@ -/* Typography.less - * Headings, body text, lists, code, and more for a versatile and durable typography system - * ---------------------------------------------------------------------------------------- */ +// Typography.less +// Headings, body text, lists, code, and more for a versatile and durable typography system +// ---------------------------------------------------------------------------------------- // BODY TEXT |