Fix conflicts in `CHANGELOG.md`

More details in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1769

Fix conflicts in `CHANGELOG.md`
More details in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1769
121bfbb9 · Timothy Andrew · e6bdf4fd · 121bfbb9
Commit 121bfbb9 authored May 02, 2017 by Timothy Andrew
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

CHANGELOG.md CHANGELOG.md +0 -6

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,12 +4,6 @@ entry.

 ## 9.1.2 (2017-05-01)

-<<<<<<< HEAD
- No changes.
- No changes.
- No changes.
-=======
->>>>>>> ce-com/master
 - Add index on ci_runners.contacted_at. !10876 (blackst0ne)
 - Fix pipeline events description for Slack and Mattermost integration. !10908
 - Fixed milestone sidebar showing incorrect number of MRs when collapsed. !10933