Remove merge artifacts from CHANGELOG

RedHatSatellite · Oct 14, 2018 · 0715274 · 0715274
1 parent 33ab65c
commit 0715274
Showing 1 changed file with 0 additions and 11 deletions.
diff --git 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