diff options
| author | Mark Otto <[email protected]> | 2011-10-22 15:51:24 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-10-22 15:51:24 -0700 |
| commit | fb7fbdb278cc76c597acb69de5cd3a5d6eb77b00 (patch) | |
| tree | 1a5eaa04a4938a0c26ee092c7bc457f578bf5ebb | |
| parent | d4675bf4ef8019fc80e3b6816d3597c07cde81df (diff) | |
| parent | 2e09ffe3832106fab60dc01cc3159c13029bdf68 (diff) | |
| download | bootstrap-fb7fbdb278cc76c597acb69de5cd3a5d6eb77b00.tar.xz bootstrap-fb7fbdb278cc76c597acb69de5cd3a5d6eb77b00.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
lib/responsive.less
| -rw-r--r-- | bootstrap.css | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bootstrap.css b/bootstrap.css index 256ab096b..aebabeecc 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,11 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * 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: Fri Oct 21 11:54:44 CDT 2011 +>>>>>>> 2e09ffe3832106fab60dc01cc3159c13029bdf68 */ /* 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). |