colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-16 13:31:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed: missed conflict

Browse Source
This commit is contained in:
daboe01 committed 2022-03-22 23:07:12 +01:00
1 parent 8089973b7b
commit 531be2db49
1 file changed
-2
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CoreAnimation/CPAnimationContext.j
-2
View File
@@ -368,8 +368,6 @@ var _CPAnimationContextStack = nil,
duration:anAction.duration,
timingfunctions:anAction.timingfunctions
};
=======
>>>>>>> pl_2507
}
- (void)setCompletionHandler:(Function)aCompletionHandler