left merge relics

rikaix · May 30, 2012 · 9760c23 · 9760c23
1 parent 9150e87
commit 9760c23
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/dom/animate/animate.js b/dom/animate/animate.js
@@ -156,7 +156,6 @@ steal('jquery', 'jquery/dom/styles').then(function () {
 
 			// Add everything to the animation queue
 			// Most of of these calls need to happen once per element
-<<<<<<< HEAD
 			var current, //current CSS values
 				properties = [], // The list of properties passed
 				to = "",