Fix conflicts

packages/strapi-admin/package.json

@@ -66,4 +66,4 @@
     "npm": ">= 3.0.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-bookshelf/package.json

@@ -56,4 +56,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-ejs/package.json

@@ -46,4 +46,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-admin/package.json

@@ -41,4 +41,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-api/package.json

@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-controller/package.json

@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-model/package.json

@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-new/package.json

@@ -46,4 +46,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-plugin/package.json

@@ -44,4 +44,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-policy/package.json

@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-service/package.json

@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate/package.json

@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-helper-plugin/package.json

@@ -115,4 +115,4 @@
     "webpack-hot-middleware": "^2.18.2",
     "whatwg-fetch": "^2.0.3"
   }
-}
+}

packages/strapi-knex/package.json

@@ -46,4 +46,4 @@
     "npm": ">= 5.0.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-middleware-views/package.json

@@ -46,4 +46,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-mongoose/package.json

@@ -49,4 +49,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-plugin-content-manager/package.json

@@ -65,4 +65,4 @@
     "rimraf": "^2.6.2",
     "webpack": "^3.8.1"
   }
-}
+}

packages/strapi-plugin-content-type-builder/package.json

@@ -70,4 +70,4 @@
     "npm": ">= 3.0.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-plugin-settings-manager/package.json

@@ -67,4 +67,4 @@
     "npm": ">= 3.0.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-redis/package.json

@@ -47,4 +47,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-utils/package.json

@@ -45,4 +45,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}