From: Corey Frang <gnarf@gnarf.net>
Date: Sat, 27 Jun 2015 00:30:52 +0000 (-0400)
Subject: Tests: Fix merge conflict
X-Git-Tag: 3.0.0-alpha1+compat~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d07774ae0632a8a43ff490562c0e9bb3ae63e2dc;p=jquery.git

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 a80d2dbd6..a6b5748f5 100644
--- 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 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;