Tests: Fix merge conflict

Introduced in 6b10f9d7e9fb6d062d2bbda49196544cd059b05c originally.

Had a rebase conflict that I fixed but forgot to ⌘-s. ☹

diff --git a/src/effects.js b/src/effects.js
index a80d2dbd66cfc409e930d345b8370d56afae9421..a6b5748f5916f56d6121f753542a87fbcd2c8c48 100644 (file)
--- a/src/effects.js
+++ b/src/effects.js
@@ -382,8 +382,6 @@ function Animation( elem, properties, options ) {
 }
 
 jQuery.Animation = jQuery.extend( Animation, {
-<<<<<<< HEAD
-=======
 
        tweeners: {
                "*": [ function( prop, value ) {
@@ -393,7 +391,6 @@ jQuery.Animation = jQuery.extend( Animation, {
                } ]
        },
 
->>>>>>> b3b2d6c... Effects: Adding unit tests for jQuery.Animation
        tweener: function( props, callback ) {
                if ( jQuery.isFunction( props ) ) {
                        callback = props;

diff --git a/test/unit/effects.js b/test/unit/effects.js
index cf16e49cd026d424cdee0f855f1095f3b9e73546..dd562d399ce8928827dd85260758649fa5f2df41 100644 (file)
--- 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;