kylefang/AsyncDisplayKit
1
0
Fork 0
mirror of https://github.com/HackPlan/AsyncDisplayKit.git synced 2026-04-01 12:23:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Michael Schneider
2016-08-10 12:09:50 -07:00
parent 4000433da1
commit 1b2eae60a6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AsyncDisplayKit/Private/ASLayoutTransition.mm
View File

@@ -75,7 +75,7 @@ static inline BOOL ASLayoutCanTransitionAsynchronous(ASLayout *layout) {
- (BOOL)isSynchronous
{
ASDN::MutexSharedLocker l(__instanceLock__);
return !ASLayoutCanTransitionAsynchronous(_pendingLayout);
return ASLayoutCanTransitionAsynchronous(_pendingLayout);
}
- (void)startTransition