diff options
| author | Corey Frang <gnarf@gnarf.net> | 2015-06-26 20:30:52 -0400 |
|---|---|---|
| committer | Corey Frang <gnarf@gnarf.net> | 2015-06-26 20:30:56 -0400 |
| commit | d07774ae0632a8a43ff490562c0e9bb3ae63e2dc (patch) | |
| tree | a7b5b463157a484779b7564c5c10db16f1cec8c4 /test/unit | |
| parent | 1390d0736f6cff7a75ec0730967a98e26df1aa13 (diff) | |
| download | jquery-d07774ae0632a8a43ff490562c0e9bb3ae63e2dc.tar.gz jquery-d07774ae0632a8a43ff490562c0e9bb3ae63e2dc.zip | |
Tests: Fix merge conflict
Introduced in 6b10f9d7e9fb6d062d2bbda49196544cd059b05c originally.
Had a rebase conflict that I fixed but forgot to ⌘-s. ☹
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/effects.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/test/unit/effects.js b/test/unit/effects.js index cf16e49cd..dd562d399 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -17,12 +17,8 @@ module("effects", { jQuery.fx.interval = 10; }, teardown: function() { -<<<<<<< HEAD - this.clock.restore(); -======= this.sandbox.restore(); jQuery.now = Date.now; ->>>>>>> cdaed15... Effects: Add tests for jQuery.Tween jQuery.fx.stop(); jQuery.fx.interval = this._oldInterval; window.requestAnimationFrame = oldRaf; |