merge master fix conflicts

This commit is contained in:
Horcrux
2017-01-09 11:11:12 +08:00
78 changed files with 1582 additions and 766 deletions
+2 -2
View File
@@ -7,9 +7,9 @@
*/
#import "RNSVGImage.h"
#import "RCTImageSource.h"
#import "RCTConvert+RNSVG.h"
#import "RCTLog.h"
#import <React/RCTImageSource.h>
#import <React/RCTLog.h>
#import "RNSVGViewBox.h"
@implementation RNSVGImage