diff options
Diffstat (limited to 'bootstrap-1.2.0.css')
| -rw-r--r-- | bootstrap-1.2.0.css | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index ed54d4376..da9e1f227 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.2.0.css @@ -6,11 +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. -<<<<<<< HEAD:bootstrap-1.1.1.css - * Date: Sun Aug 28 17:50:10 PDT 2011 -======= - * Date: Fri Sep 2 15:07:03 PDT 2011 ->>>>>>> 2589c0ac4ecc86feed81cfc5df344e0eb78cda64:bootstrap-1.2.0.css + * Date: Fri Sep 2 21:04:38 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). |