diff options
| author | Mark Otto <[email protected]> | 2014-05-20 23:21:12 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-20 23:21:12 -0700 |
| commit | 91d51d3fba1cc2f80138bb2858ce67c28c9c8a89 (patch) | |
| tree | 32fd8faabe6fdb8d17aea70fc7ccd56524d92aba /js/tests/unit | |
| parent | c42cd8164c8698cbc3acfbb99e525bd8f195d819 (diff) | |
| parent | 3dd1531d81c90d6d1cf04962032f868d315ab21c (diff) | |
| download | bootstrap-91d51d3fba1cc2f80138bb2858ce67c28c9c8a89.tar.xz bootstrap-91d51d3fba1cc2f80138bb2858ce67c28c9c8a89.zip | |
Merge branch 'master' into icon_paths
Diffstat (limited to 'js/tests/unit')
| -rw-r--r-- | js/tests/unit/modal.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index c1dc895e3..d8bef3ea1 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -19,7 +19,7 @@ $(function () { }) test('should provide no conflict', function () { - ok(!$.fn.modal, 'modal was set back to undefined (org value)') + ok(!$.fn.modal, 'modal was set back to undefined (orig value)') }) test('should return element', function () { |