Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip

aa07523e · Mark Otto · d9593e21 · d9fe9af9 · aa07523e
Commit aa07523e authored Aug 25, 2012 by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

js/tests/unit/bootstrap-tooltip.js js/tests/unit/bootstrap-tooltip.js +1 -1

No files found.
--- a/js/tests/unit/bootstrap-tooltip.js
+++ b/js/tests/unit/bootstrap-tooltip.js
@@ -113,7 +113,7 @@ $(function () {
        }, 50)
      })

-      test("should show tooltip if leave event hasn't occured before delay expires", function () {
+      test("should show tooltip if leave event hasn't occurred before delay expires", function () {
        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
          .appendTo('#qunit-fixture')
          .tooltip({ delay: 150 })