diff --git a/AppKit/CoreAnimation/CPAnimationContext.j b/AppKit/CoreAnimation/CPAnimationContext.j
index b3e43f582..7bbae64c4 100644
--- a/AppKit/CoreAnimation/CPAnimationContext.j
+++ b/AppKit/CoreAnimation/CPAnimationContext.j
@@ -368,8 +368,6 @@ var _CPAnimationContextStack   = nil,
                 duration:anAction.duration,
                 timingfunctions:anAction.timingfunctions
             };
-=======
->>>>>>> pl_2507
 }
 
 - (void)setCompletionHandler:(Function)aCompletionHandler