fix: merge develop

packages/medusa-plugin-brightpearl/CHANGELOG.md

@@ -3,6 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<<<<<<< HEAD
 ## [1.1.11](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.10...medusa-plugin-brightpearl@1.1.11) (2021-04-13)
 
 
@@ -10,6 +11,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 * bp swaps ([e105d4e](https://github.com/medusajs/medusa/commit/e105d4edde5793f40e867291606b3db5e44dc24f))
 * typo ([37ab52b](https://github.com/medusajs/medusa/commit/37ab52b19514fb1dfd864f0c218efd7ad205ff30))
+=======
+## [1.1.11](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.10...medusa-plugin-brightpearl@1.1.11) (2021-04-09)
+
+**Note:** Version bump only for package medusa-plugin-brightpearl
+>>>>>>> origin/develop
 
 
 

packages/medusa-plugin-brightpearl/package.json

@@ -43,7 +43,7 @@
     "axios": "^0.19.2",
     "axios-rate-limit": "^1.2.1",
     "express": "^4.17.1",
-    "medusa-core-utils": "^1.1.4",
+    "medusa-core-utils": "^1.1.5",
     "randomatic": "^3.1.1"
   },
   "gitHead": "d78a7ce85876e0bfd9a4bfebe4f5743921961e9c"