From d07774ae0632a8a43ff490562c0e9bb3ae63e2dc Mon Sep 17 00:00:00 2001
From: Corey Frang <gnarf@gnarf.net>
Date: Fri, 26 Jun 2015 20:30:52 -0400
Subject: Tests: Fix merge conflict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Introduced in 6b10f9d7e9fb6d062d2bbda49196544cd059b05c originally.

Had a rebase conflict that I fixed but forgot to ⌘-s. ☹
---
 test/unit/effects.js | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'test/unit')

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;
-- 
cgit v1.2.3