From 1b2eae60a60009002d494553ff9fa8b8ba3bb27f Mon Sep 17 00:00:00 2001
From: Michael Schneider <mischneider1@gmail.com>
Date: Wed, 10 Aug 2016 12:09:50 -0700
Subject: [PATCH] Fix merge conflict

---
 AsyncDisplayKit/Private/ASLayoutTransition.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AsyncDisplayKit/Private/ASLayoutTransition.mm b/AsyncDisplayKit/Private/ASLayoutTransition.mm
index 1a167af2..889ac2b6 100644
--- a/AsyncDisplayKit/Private/ASLayoutTransition.mm
+++ b/AsyncDisplayKit/Private/ASLayoutTransition.mm
@@ -75,7 +75,7 @@ static inline BOOL ASLayoutCanTransitionAsynchronous(ASLayout *layout) {
 - (BOOL)isSynchronous
 {
   ASDN::MutexSharedLocker l(__instanceLock__);
-  return !ASLayoutCanTransitionAsynchronous(_pendingLayout);
+  return ASLayoutCanTransitionAsynchronous(_pendingLayout);
 }
 
 - (void)startTransition