Remove rebase leftovers

WordPress · Jul 15, 2022 · e6f71a7 · e6f71a7
1 parent 86e3bf0
commit e6f71a7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/packages/env/CHANGELOG.md b/packages/env/CHANGELOG.md
@@ -2,7 +2,6 @@
 
 ## Unreleased
 
-<<<<<<< HEAD
 ### Bug Fix
 
 -   Restrict `WP_TESTS_DOMAIN` constant to just hostname rather than an entire URL (e.g. it now excludes scheme, port, etc.) ([#41039](https://github.com/WordPress/gutenberg/pull/41039)).
@@ -11,9 +10,6 @@
 ### Enhancement
 -   Removed the need for quotation marks when passing options to `wp-env run`.
 -   Setting a `config` key to `null` will prevent adding the constant to `wp-config.php` even if a default value is defined by `wp-env`.
-=======
-- Restrict `WP_TESTS_DOMAIN` constant to just hostname rather than an entire URL (e.g. it now excludes scheme, port, etc.)
->>>>>>> e2f23b2c81 (Clarify changelog entry)
 
 ## 4.7.0 (2022-05-18)