From dcf7cd620d9e957d384e143eb2fb2cca7351cfae Mon Sep 17 00:00:00 2001 From: Levi Bostian Date: Fri, 10 Jan 2014 22:58:45 -0600 Subject: Add to exceptions section. Add NSError reference. --- objective-c.html.markdown | 3 --- 1 file changed, 3 deletions(-) (limited to 'objective-c.html.markdown') diff --git a/objective-c.html.markdown b/objective-c.html.markdown index 59169b16..348a72d5 100644 --- a/objective-c.html.markdown +++ b/objective-c.html.markdown @@ -718,7 +718,6 @@ int main (int argc, const char * argv[]) { @interface Car : NSObject // Name of protocol goes inside <> // You don't need the @property or method names here for CarUtilities. Only @implementation does. - (void)turnOnEngineWithUtilities:(id )car; // You can use protocols as data too. -<<<<<<< HEAD @end // The @implementation needs to implement the @properties and methods for the protocol. @implementation Car : NSObject @@ -760,7 +759,6 @@ if ([myClass conformsToProtocol:@protocol(CarUtilities)]) { - (void)beNiceToBrother:(id )brother; -======= @end // The @implementation needs to implement the @properties and methods for the protocol. @implementation Car : NSObject @@ -802,7 +800,6 @@ if ([myClass conformsToProtocol:@protocol(CarUtilities)]) { - (void)beNiceToBrother:(id )brother; ->>>>>>> 8c6f583... Add much more to the protocols section. @end // See the problem is that Sister relies on Brother, and Brother relies on Sister. #import "Sister.h" -- cgit v1.2.3