Skip to content

B
bootstrap
Commit fb7fbdb2 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 

Conflicts:
	bootstrap.css
	lib/responsive.less
parents d4675bf4 2e09ffe3
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
bootstrap.css
View file @ fb7fbdb2
...@@ -6,7 +6,11 @@ ...@@ -6,7 +6,11 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
<<<<<<< HEAD
* Date: Sat Oct 22 15:49:12 PDT 2011 * Date: Sat Oct 22 15:49:12 PDT 2011
=======
* Date: Fri Oct 21 11:54:44 CDT 2011
>>>>>>> 2e09ffe3832106fab60dc01cc3159c13029bdf68
*/ */
/* Reset.less /* 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). * 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).
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment