diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f16058..2be3a3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,17 +19,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Fixed - sat_export did not handle new backend_identifier value generated by Sat 6.3 -<<<<<<< HEAD -======= - - -## [1.2.3] - 2018-03-12 -### Changed -- Export package count now counts DRPM packages exported by Sat 6.3 - -### Fixed -- sat_export did not handle new backend_identifier value generated by Sat 6.3 ->>>>>>> master ## [1.2.2] - 2018-02-25