chore: fix yarn.lock conflicts

2022-07-05 10:17:09 +02:00
parent 19a715d217 6b2a43abf1
commit 915359d84b
400 changed files with 16921 additions and 15220 deletions
--- a/packages/medusa-plugin-mailchimp/CHANGELOG.md
+++ b/packages/medusa-plugin-mailchimp/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.1.42](https://github.com/medusajs/medusa/compare/medusa-plugin-mailchimp@1.1.41...medusa-plugin-mailchimp@1.1.42) (2022-07-05)
+
+**Note:** Version bump only for package medusa-plugin-mailchimp
+
+
+
+
+
 ## [1.1.41](https://github.com/medusajs/medusa/compare/medusa-plugin-mailchimp@1.1.39...medusa-plugin-mailchimp@1.1.41) (2022-06-19)

 **Note:** Version bump only for package medusa-plugin-mailchimp
--- a/packages/medusa-plugin-mailchimp/package.json
+++ b/packages/medusa-plugin-mailchimp/package.json
@@ -1,6 +1,6 @@
 {
  "name": "medusa-plugin-mailchimp",
-  "version": "1.1.41",
+  "version": "1.1.42",
  "description": "Mailchimp newsletter subscriptions",
  "main": "index.js",
  "repository": {