From a3c0e229d2e0d7e90fbb68cdc1a7f2e855ca899e Mon Sep 17 00:00:00 2001
From: chad1008 <13856531+chad1008@users.noreply.github.com>
Date: Mon, 23 May 2022 15:28:06 -0400
Subject: [PATCH] ColorPicker: resolve CHANGELOG merge conflict

---
 packages/components/CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index c58ff18372c43..06a61236321ef 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -22,7 +22,6 @@
 
 -   `Spacer`: Add RTL support. ([#41172](https://github.com/WordPress/gutenberg/pull/41172))
 
-
 ## 19.11.0 (2022-05-18)
 
 ### Enhancements