From 4c6585d3b32a96eba0d61a99f77c630a9a2dd921 Mon Sep 17 00:00:00 2001
From: Levi McCallum <levi.mccallum@nfl.com>
Date: Tue, 29 Sep 2015 15:10:50 -0700
Subject: [PATCH] Fix build errors from bad merge

---
 AsyncDisplayKit/ASCollectionView.mm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/AsyncDisplayKit/ASCollectionView.mm b/AsyncDisplayKit/ASCollectionView.mm
index 2b1977bba8..18b39f9ee4 100644
--- a/AsyncDisplayKit/ASCollectionView.mm
+++ b/AsyncDisplayKit/ASCollectionView.mm
@@ -437,11 +437,6 @@ static BOOL _isInterceptedSelector(SEL sel)
   [_dataController moveRowAtIndexPath:indexPath toIndexPath:newIndexPath withAnimationOptions:kASCollectionViewAnimationNone];
 }
 
-- (ASCellNode *)nodeForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  return [_dataController nodeAtIndexPath:indexPath];
-}
-
 - (NSString *)__reuseIdentifierForKind:(NSString *)kind
 {
   return [NSString stringWithFormat:@"_ASCollectionSupplementaryView_%@", kind];
@@ -700,7 +695,7 @@ static BOOL _isInterceptedSelector(SEL sel)
 
 - (NSUInteger)dataController:(ASCollectionDataController *)dataController numberOfSectionsForSupplementaryKind:(NSString *)kind;
 {
-  return [self.layoutDelegate collectionView:self numerOfSectionsForSupplementaryKind:kind];
+  return [self.layoutDelegate collectionView:self numberOfSectionsForSupplementaryKind:kind];
 }
 
 - (NSUInteger)numberOfSectionsInDataController:(ASDataController *)dataController {