zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2025-12-20 14:05:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 6.0.0

Browse Source 
# Conflicts:
#	elements/TextPath.js
#	package.json
This commit is contained in:
Horcrux
2017-11-08 12:27:41 +08:00
parent 7474c90957 e1a576fd29
commit e1380828f0
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
elements/TextPath.js
View File

@@ -1,5 +1,6 @@
import React from 'react';
import createReactNativeComponentClass from 'react-native/Libraries/Renderer/shims/createReactNativeComponentClass';
import createReactNativeComponentClass from '../lib/createReactNativeComponentClass';
import {TextPathAttributes} from '../lib/attributes';
import extractText from '../lib/extract/extractText';
import Shape from './Shape';