Resolve conflicts (WooCommerce Blocks bump to 5.9.0).

woocommerce · Sep 17, 2021 · 45a424e · 45a424e
1 parent 7ae951f
commit 45a424e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 9 deletions.
diff --git a/bin/composer/mozart/composer.lock b/bin/composer/mozart/composer.lock
diff --git a/bin/composer/phpcs/composer.lock b/bin/composer/phpcs/composer.lock
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     "psr/container": "1.0.0",
     "woocommerce/action-scheduler": "3.3.0",
     "woocommerce/woocommerce-admin": "2.6.2",
-    "woocommerce/woocommerce-blocks": "5.7.1"
+    "woocommerce/woocommerce-blocks": "5.9.0"
   },
   "require-dev": {
     "bamarni/composer-bin-plugin": "^1.4",

diff --git a/composer.lock b/composer.lock