resolve conflicts

Author: kamilmysliwiec

integration/graphql/package-lock.json

@@ -13,7 +13,7 @@
     "@nestjs/core": "6.6.7",
     "@nestjs/graphql": "6.5.1",
     "apollo-server-express": "2.9.3",
-    "graphql": "14.5.5",
+    "graphql": "14.5.6",
     "graphql-tools": "4.0.5",
     "reflect-metadata": "0.1.13",
     "rxjs": "6.5.3",
@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@types/node": "7.10.7",
-    "ts-node": "8.3.0",
+    "ts-node": "8.4.1",
     "tslint": "5.20.0"
   }
 }

integration/graphql/package.json

@@ -22,6 +22,6 @@
   "devDependencies": {
     "@types/node": "7.10.7",
     "supertest": "4.0.2",
-    "ts-node": "8.3.0"
+    "ts-node": "8.4.1"
   }
 }

integration/hello-world/package-lock.json

@@ -18,6 +18,6 @@
   "devDependencies": {
     "@types/node": "7.10.7",
     "supertest": "4.0.2",
-    "ts-node": "8.3.0"
+    "ts-node": "8.4.1"
   }
 }

integration/hello-world/package.json

@@ -21,6 +21,6 @@
   "devDependencies": {
     "@types/node": "7.10.7",
     "supertest": "4.0.2",
-    "ts-node": "8.3.0"
+    "ts-node": "8.4.1"
   }
 }

integration/hooks/package-lock.json

@@ -23,6 +23,6 @@
   "devDependencies": {
     "@types/node": "7.10.7",
     "supertest": "4.0.2",
-    "ts-node": "8.3.0"
+    "ts-node": "8.4.1"
   }
 }