From 6afb356cd4b553d1f8c7e491a344de6aeb899a33 Mon Sep 17 00:00:00 2001
From: Micha White <botahamec@outlook.com>
Date: Wed, 15 Jun 2022 19:09:44 -0400
Subject: [PATCH] Wrong name, silly

---
 CHANGELOG.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b45a186629..b6ffbe886a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,12 +29,9 @@ Versions with only mechanical changes will be omitted from the following list.
 * Fix build for wasm32-unknown-emscripten (@yu-re-ka #593)
 * Make `ParseErrorKind` public and available through `ParseError::kind()` (#588)
 * Implement `DoubleEndedIterator` for `NaiveDateDaysIterator` and `NaiveDateWeeksIterator`
-<<<<<<< HEAD
 * Fix panicking when parsing a `DateTime` (@botahamec)
 * Add support for getting week bounds based on a specific `NaiveDate` and a `Weekday` (#666)
-=======
-* Add the `with_timezone` method to `NaiveDateTime``
->>>>>>> fe2bb40 (Added the change to the changelog)
+* Add the `and_timezone` method to `NaiveDateTime`
 
 ## 0.4.19