fix conflicts

This commit is contained in:
Horcrux
2017-11-07 17:26:47 +08:00
parent 9bdc23d4e6
commit 7e1cb4de3f
-4
View File
@@ -1,9 +1,5 @@
{
<<<<<<< HEAD
"version": "6.0.0-rc1",
=======
"version": "5.5.0",
>>>>>>> master
"name": "react-native-svg",
"description": "SVG library for react-native",
"repository": {