Fix merge conflicts

This commit is contained in:
Aaron Schubert
2016-04-22 09:28:23 +01:00
51 changed files with 12606 additions and 5734 deletions

View File

@@ -121,6 +121,10 @@ typedef UIImage * _Nullable (^asimagenode_modification_block_t)(UIImage *image);
@property (nonatomic, assign) BOOL isDefaultFocusAppearance;
#endif
@end
@interface ASImageNode (AnimatedImage)
/**
* @abstract The animated image to playback
*