From: Mark Otto <markotto@twitter.com>
Date: Sun, 15 Apr 2012 03:56:50 +0000 (-0700)
Subject: fix #3068: compile after changing comment
X-Git-Tag: v2.0.3~5^2~34^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=490eb1bd16177f951b7c66c364d2eee6a6288a5d;p=thirdparty%2Fbootstrap.git

fix #3068: compile after changing comment
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 2be92692fa..0fd350f5b5 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b5ff8ee41c..131e6671ee 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1205,8 +1205,6 @@ legend + .control-group {
 }
 .form-horizontal .controls {
   margin-left: 160px;
-  /* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */
-
   *display: inline-block;
   *margin-left: 0;
   *padding-left: 20px;