Resolve conflict in CHANGELOG.md and CHANGELOG-EE.md

Signed-off-by: Rémy Coutable <remy@rymai.me>

CHANGELOG-EE.md

@@ -33,8 +33,9 @@ Please view this file on the master branch, on stable branches it's out of date.
 
 - Reduce the quiet times between scheduler runs on Geo secondaries. !3185
 
-### Added (19 changes, 1 of them is from the community)
+### Added (20 changes, 1 of them is from the community)
 
+- Add new push rule to enforce that only the author of a commit can push to the repository. !3086
 - Make the maximum capacity of Geo backfill operations configurable. !3107
 - Mirrors can now hard fail, keeping them from being retried until a project admin takes action. !3117
 - View/edit epic at group level. !3126

CHANGELOG.md

@@ -62,10 +62,7 @@ entry.
 - Update container repository path reference and allow using double underscore. !15417
 - Fix crash when navigating to second page of the group dashbaord when there are projects and groups on the first page. !15456
 - Fix flash errors showing up on a non configured prometheus integration. !35652
-<<<<<<< HEAD
-=======
 - Fix timezone bug in Pikaday and upgrade Pikaday version.
->>>>>>> upstream/master
 - Fix arguments Import/Export error importing project merge requests.
 - Moves mini graph of pipeline to the end of sentence in MR widget. Cleans HTML and tests.
 - Fix user autocomplete in subgroups.
@@ -99,10 +96,6 @@ entry.
 - Only set Auto-Submitted header once for emails on push.
 - Fix overlap of right-sidebar and main content when creating a Wiki page.
 - Enables scroll to bottom once user has scrolled back to bottom in job log.
-<<<<<<< HEAD
-- Fix timezone bug in Pikaday and upgrade Pikaday version.
-=======
->>>>>>> upstream/master
 
 ### Changed (21 changes, 7 of them are from the community)
 
@@ -145,14 +138,8 @@ entry.
 - Optimise getting the pipeline status of commits.
 - Improve performance of commits list by fully using DB index when getting commit note counts.
 
-<<<<<<< HEAD
-### Added (27 changes, 10 of them are from the community)
-
-- Add new push rule to enforce that only the author of a commit can push to the repository. !3086
-=======
 ### Added (26 changes, 10 of them are from the community)
 
->>>>>>> upstream/master
 - Expose duration in Job entity. !13644 (Mehdi Lahmam (@mehlah))
 - Prevent git push when LFS objects are missing. !13837
 - Automatic configuration settings page. !13850 (Francisco Lopez)