diff options
| author | Mark Otto <[email protected]> | 2011-08-21 20:51:25 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-21 20:51:25 -0700 |
| commit | 5668723db24d4d3fd7015701ce5df5c1bdb58df1 (patch) | |
| tree | adf261b7dad76ee189c00d9643d518c5f0e296c7 | |
| parent | 23ec21d0498a4a5c18dcbef9ec835bb0ef80aa22 (diff) | |
| download | bootstrap-5668723db24d4d3fd7015701ce5df5c1bdb58df1.tar.xz bootstrap-5668723db24d4d3fd7015701ce5df5c1bdb58df1.zip | |
resolve conflicts again and rebuild
| -rw-r--r-- | bootstrap-1.0.0.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 08bbb7bba..88537a961 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.css @@ -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). |