mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-22 22:25:57 +00:00
Fix merge conflicts
This commit is contained in:
@@ -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
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user