From c6fa897dc2826bad6f32c5ecc6ad1f0c5afc84df Mon Sep 17 00:00:00 2001
From: Scott Goodson <scottg@pinterest.com>
Date: Fri, 25 Dec 2015 15:35:52 -0800
Subject: [PATCH] Add nullability annotations to newer APIs that lacked it from
 the original PR.

---
 AsyncDisplayKit-Prefix.gcda        | Bin 656 -> 656 bytes
 AsyncDisplayKit/ASDisplayNode.h    |   2 +-
 AsyncDisplayKit/ASTableView.h      |   8 +++-----
 AsyncDisplayKit/ASViewController.m |   6 ++++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/AsyncDisplayKit-Prefix.gcda b/AsyncDisplayKit-Prefix.gcda
index 7564c6c3f5969754bf6ba6879ed2be0be65a12ff..83c74d3faa7677539da52471bcce34199dab999b 100644
GIT binary patch
literal 656
zcmb`E%}T^D6on`Ltwix3T)EbbGo!;e;G#HP3`miQZWIYIy-tgv8IrWncknG-&s(_h
z8Ql9E-n4<4ML`7v=iW3V-#v%&SWJ#Pr)RBtkxjpGZ5?&;5Kx-&sY#T*1!J$cfg>h)
zsd5`+@h~-0{D@QxgGc|AU?*Fy_=64X%^VFP*Cs7Mme<Y5rJ6zZu={;$`!_ra)|)ed
zDKn91m8smwa`3G5+%LP2DB{R2mSvP%&U>TZgo~F{mUIy}o<|r%7Q+JDb{T8;3aFr1
zn6YSLa?=lJoi?KEf=j6cw@Qy_mxW<C?1Y88>wUT0E2ztl;LYWB=M}e&@B#!rWKZ}{
uMt6Po7d}pk5J&d0tfG3e+3U`K@Xv(=uB!|#tebI&WexR7-oFlhnDGsPqqmj-

literal 656
zcmYdHNlw=?GB9a6bMz1c0|TQ1kN|-u_8Tg)Ksr9k&)Cp0IJhJ+Iom0*I5j6TFEt>)
zII|=(KQA@KC$TcWw8T6)KewQ?B-J&@+sGKI7F`Wc$_Oe2(G*;enjBnGnUfmiZ3wa;
zvnn+xF)uw8Xs2UAK@N~&6ao=IEck5i2Yw(OALV0cngn%(TYiyeNop=`a|66B9D^Zt
z0rfhjqy&SE69y7YK-{({PDlVq1N|3VVjLfDXjYb*Tmm#R)FM8<xTGjQFFgRR-!C}c
zGBGD7KRFSkBG@?I)z#I-(6tPx-zPsY1xSI-Wd<@**&9DlX08#~T#&m!=86Id79h4g
z>9`ma9&q;>0v!!;ay%$Vh<7){e4r2fK<0}9305FBTf4Rg6gCu_Z<?Hwnpgz(11Jzd
Sc1QsUHXy#uc;uNl0XqOIIK(~x

diff --git a/AsyncDisplayKit/ASDisplayNode.h b/AsyncDisplayKit/ASDisplayNode.h
index 5c4d967051..cad8539ac8 100644
--- a/AsyncDisplayKit/ASDisplayNode.h
+++ b/AsyncDisplayKit/ASDisplayNode.h
@@ -27,7 +27,7 @@ typedef UIView * _Nonnull(^ASDisplayNodeViewBlock)();
 /**
  * UIView creation block. Used to create the backing view of a new display node.
  */
-typedef UIViewController *(^ASDisplayNodeViewControllerBlock)();
+typedef UIViewController * _Nonnull(^ASDisplayNodeViewControllerBlock)();
 
 /**
  * CALayer creation block. Used to create the backing layer of a new display node.
diff --git a/AsyncDisplayKit/ASTableView.h b/AsyncDisplayKit/ASTableView.h
index 5d7c977615..d3e2b05b51 100644
--- a/AsyncDisplayKit/ASTableView.h
+++ b/AsyncDisplayKit/ASTableView.h
@@ -361,9 +361,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-<<<<<<< HEAD
-NS_ASSUME_NONNULL_END
-=======
-@protocol ASTableViewDelegate <ASTableDelegate>;
+@protocol ASTableViewDelegate <ASTableDelegate>
 @end
->>>>>>> master
+
+NS_ASSUME_NONNULL_END
diff --git a/AsyncDisplayKit/ASViewController.m b/AsyncDisplayKit/ASViewController.m
index 519ac4b389..9679785558 100644
--- a/AsyncDisplayKit/ASViewController.m
+++ b/AsyncDisplayKit/ASViewController.m
@@ -18,12 +18,14 @@
 
 - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
-  return [self initWithNode:nil];
+  ASDisplayNodeAssert(NO, @"ASViewController requires using -initWithNode:");
+  return [self initWithNode:[[ASDisplayNode alloc] init]];
 }
 
 - (instancetype)initWithCoder:(NSCoder *)aDecoder
 {
-  return [self initWithNode:nil];
+  ASDisplayNodeAssert(NO, @"ASViewController requires using -initWithNode:");
+  return [self initWithNode:[[ASDisplayNode alloc] init]];
 }
 
 - (instancetype)initWithNode:(ASDisplayNode *)node