Added the change to the changelog

chronotope · Jun 15, 2022 · 95f421b · 95f421b
1 parent 9f8a663
commit 95f421b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,8 +29,12 @@ 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)
 
 ## 0.4.19