From 531be2db497deb884017c5b0b4e76d60839f2505 Mon Sep 17 00:00:00 2001
From: daboe01 <daboe01@googlemail.com>
Date: Tue, 22 Mar 2022 23:07:12 +0100
Subject: [PATCH] fixed: missed conflict

---
 AppKit/CoreAnimation/CPAnimationContext.j | 2 --
 1 file changed, 2 deletions(-)

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