mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-19 06:18:22 +01:00
resolve conflicts again and rebuild
This commit is contained in:
parent
23ec21d049
commit
5668723db2
2
bootstrap-1.0.0.css
vendored
2
bootstrap-1.0.0.css
vendored
@ -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).
|
||||
|
Loading…
x
Reference in New Issue
Block a user