diff options
| author | Levi Bostian <levi.bostian@gmail.com> | 2014-01-10 22:58:45 -0600 |
|---|---|---|
| committer | Levi Bostian <levi.bostian@gmail.com> | 2014-03-19 12:49:51 -0500 |
| commit | dcf7cd620d9e957d384e143eb2fb2cca7351cfae (patch) | |
| tree | abcbeea6734766e475b1c23771e51065234f2af3 /objective-c.html.markdown | |
| parent | 25fb918e9c0ef62205de86321d503aabf250f60a (diff) | |
Add to exceptions section. Add NSError reference.
Diffstat (limited to 'objective-c.html.markdown')
| -rw-r--r-- | objective-c.html.markdown | 3 |
1 files changed, 0 insertions, 3 deletions
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 <CarUtilities> // Name of protocol goes inside <> // You don't need the @property or method names here for CarUtilities. Only @implementation does. - (void)turnOnEngineWithUtilities:(id <CarUtilities>)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 <CarUtilities> @@ -760,7 +759,6 @@ if ([myClass conformsToProtocol:@protocol(CarUtilities)]) { - (void)beNiceToBrother:(id <Brother>)brother; -======= @end // The @implementation needs to implement the @properties and methods for the protocol. @implementation Car : NSObject <CarUtilities> @@ -802,7 +800,6 @@ if ([myClass conformsToProtocol:@protocol(CarUtilities)]) { - (void)beNiceToBrother:(id <Brother>)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" |