Merge conflict

Sean Perkins · Sean Perkins · commit 4ac7cda019a7 · 2017-01-24T23:48:22.000-05:00
diff --git a/package.json b/package.json
@@ -59,10 +59,6 @@
     "@types/es6-promise": "0.0.28"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "nativescript-permissions": "^1.2.1"
-=======
     "nativescript-permissions":"latest"
->>>>>>> origin/android-fixes
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,6 @@`
`59`	`59`	`"@types/es6-promise": "0.0.28"`
`60`	`60`	`},`
`61`	`61`	`"dependencies": {`
`62`		`-<<<<<<< HEAD`
`63`		`- "nativescript-permissions": "^1.2.1"`
`64`		`-=======`
`65`	`62`	`"nativescript-permissions":"latest"`
`66`		`->>>>>>> origin/android-fixes`
`67`	`63`	`}`
`68`	`64`	`}`