diff options
| author | Mark Otto <[email protected]> | 2013-05-16 20:32:37 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-16 20:32:37 -0700 |
| commit | 0f4b4acce1df7f2cdfc6e0ad6dca59480868bd8d (patch) | |
| tree | 55ffc7fe20fbbabbfb6b4cb9a6e6f8d7e94467cf /js/tests/unit/button.js | |
| parent | 8a3e98230544cd2197a57c6e9cb01e3ceeb7a678 (diff) | |
| parent | 2433a076acc4dc318d238fd78361130a92e0a341 (diff) | |
| download | bootstrap-0f4b4acce1df7f2cdfc6e0ad6dca59480868bd8d.tar.xz bootstrap-0f4b4acce1df7f2cdfc6e0ad6dca59480868bd8d.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'js/tests/unit/button.js')
| -rw-r--r-- | js/tests/unit/button.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js index aaf480c32..943d36d1b 100644 --- a/js/tests/unit/button.js +++ b/js/tests/unit/button.js @@ -1,6 +1,6 @@ $(function () { - module("buttons") + module("button") test("should provide no conflict", function () { var button = $.fn.button.noConflict() |