From 0db2d45350a67bc1a98c0f2d1c4706e3bd25ca50 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 25 Jan 2012 15:04:41 -0800
Subject: update mixins to use slightly diff variables within some parametric
 mixins

---
 bootstrap.css | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'bootstrap.css')

diff --git a/bootstrap.css b/bootstrap.css
index 931d0c017..0d81b9b03 100644
--- a/bootstrap.css
+++ b/bootstrap.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
- * Date: Wed Jan 25 12:03:47 PST 2012
-=======
- * Date: Wed Jan 25 11:49:21 PST 2012
->>>>>>> 04f84997c18f2f132c8173f728f72b6b7aef52d1
+ * Date: Wed Jan 25 15:04:24 PST 2012
  */
 article,
 aside,
@@ -1868,7 +1864,7 @@ table .headerSortUp:after {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query::-webkit-input-placeholder {
+.navbar-search .search-query ::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
-- 
cgit v1.2.3