fix(pushnotification): revert change in pr 952

aws-amplify · Jun 4, 2018 · b8d167c · b8d167c
1 parent 257fc40
commit b8d167c
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/packages/aws-amplify-react-native/package.json b/packages/aws-amplify-react-native/package.json
@@ -20,11 +20,7 @@
     "rimraf": "^2.6.2"
   },
   "dependencies": {
-<<<<<<< HEAD
     "aws-amplify": "^0.4.3",
-=======
-    "aws-amplify": "^0.4.2-unstable.33",
->>>>>>> origin
     "axios": "^0.17.1",
     "babel-preset-es2015": "^6.24.1"
   },

diff --git a/packages/aws-amplify-react/package.json b/packages/aws-amplify-react/package.json
@@ -50,11 +50,7 @@
     "graphql": "0.13.0"
   },
   "dependencies": {
-<<<<<<< HEAD
     "aws-amplify": "^0.4.3",
-=======
-    "aws-amplify": "^0.4.2-unstable.33",
->>>>>>> origin
     "qrcode.react": "^0.8.0",
     "regenerator-runtime": "^0.11.1"
   }

diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json
@@ -60,11 +60,7 @@
     "@types/paho-mqtt": "^1.0.3",
     "@types/zen-observable": "^0.5.3",
     "amazon-cognito-auth-js": "^1.1.9",
-<<<<<<< HEAD
     "amazon-cognito-identity-js": "^2.0.8",
-=======
-    "amazon-cognito-identity-js": "^2.0.7-unstable.35",
->>>>>>> origin
     "aws-sdk": "2.198.0",
     "axios": "^0.17.0",
     "graphql": "0.13.0",