From: Mark Otto <markdotto@gmail.com>
Date: Sat, 2 Jul 2011 05:16:29 +0000 (-0700)
Subject: resolve merge conflict
X-Git-Tag: v1.0.0~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=163e68ade6eb9e1a8a2e52aadf975612ab850579;p=thirdparty%2Fbootstrap.git

resolve merge conflict
---

163e68ade6eb9e1a8a2e52aadf975612ab850579
diff --cc docs/assets/js/application.js
index 4b377f7043,8b29f6c21a..82cf307e91
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@@ -34,9 -81,12 +81,12 @@@ $(document).ready(function()
        $(this).parents('.add-on').removeClass('active');
      }
    });
-   
-   // Disable certain links and buttons in docs
+ 
+ 
+   // Disable certain links in docs
+   // =============================
+ 
 -  $('ul.tabs a, ul.pills a, .pagination a').click(function(e) {
 +  $('ul.tabs a, ul.pills a, .pagination a, .well .btn, .actions .btn, .alert-message .btn, a.close').click(function(e) {
      e.preventDefault();
    });