Revert "Merge branch 'release/4.9.0' into trunk"

This reverts commit f79b960b59, reversing
changes made to 5b65a02297.

plugins/woocommerce-blocks/docs/testing/releases/491.md

@@ -1,16 +0,0 @@
-## Testing notes and ZIP for release 4.9.1
-
-Zip file for testing: [woocommerce-gutenberg-products-block.zip](https://github.com/woocommerce/woocommerce-gutenberg-products-block/files/6304864/woocommerce-gutenberg-products-block.zip)
-
-## Feature plugin and package inclusion in WooCommerce core
-
-### Breakage with Elementor ([4056](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/4056))
-
-- On a website with PHP 8, install Elementor.
-- Enable any payment method.
-- Create a new page, and select "Edit with Elementor", there should be no fatal errors.
-
-### Smoke Testing
-
-- Cart and Checkout block should load fine on frontend.
-- Cart and Checkout should be insertable.

plugins/woocommerce-blocks/docs/testing/releases/README.md

@@ -28,4 +28,3 @@ Every release includes specific testing instructions for new features and bug fi
 -   [4.7.0](./470.md)
 -   [4.8.0](./480.md)
 -   [4.9.0](./490.md)
--   [4.9.1](./491.md)

plugins/woocommerce-blocks/readme.txt

@@ -85,15 +85,6 @@ Release and roadmap notes available on the [WooCommerce Developers Blog](https:/
 
 == Changelog ==
 
-<<<<<<< HEAD
-=======
-= 4.9.1 - 2021-04-13 =
-
-#### Bug Fixes
-
-- Check if Cart and Checkout are registered before removing payment methods. ([4056](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/4056))
-
->>>>>>> release/4.9.0
 = 4.9.0 - 2021-04-12 =
 #### Enhancements