Update CHANGELOG.md

Co-authored-by: Larícia Mota <laricia.mota@vtex.com.br>
vtex-sites · Mar 25, 2022 · 7edaf5f · 7edaf5f
1 parent 2d95b14
commit 7edaf5f
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,11 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Suggestions` component.
 - `SearchHistory` component.
 - `Badge` interactive variation.
-<<<<<<< HEAD
 - New folder `styles/global` containing all global styles.
-=======
-- Session mutation when user enter a new postal code.
->>>>>>> e688d78f (Add session mutation and mutate session after change postal code)
+- Session mutation when the user enters a new postal code.
 
 ### Changed