merge master fix conflicts · f9fe7bdc4e - react-native-svg - Gitea: Git with a cup of tea

zoriya/react-native-svg

mirror of https://github.com/zoriya/react-native-svg.git synced 2026-06-06 08:22:23 +00:00

merge master fix conflicts

This commit is contained in:

Horcrux

2017-01-09 11:11:12 +08:00

parent 44860a02ff d5246a5def

commit f9fe7bdc4e

78 changed files with 1582 additions and 766 deletions

									
										ios/Elements/RNSVGSvgView.m
									
		+1
		-1
	
												View File
												
				@@ -9,7 +9,7 @@

				#import "RNSVGSvgView.h"

				#import "RNSVGNode.h"

				#import "RCTLog.h"

				#import <React/RCTLog.h>

				@implementation RNSVGSvgView

				{