Fix conflicts in CHANGELOG.md

[ci skip]

Fix conflicts in CHANGELOG.md
[ci skip]
cbfa94f1 · Stan Hu · 72ef79b3 · cbfa94f1
Commit cbfa94f1 authored May 30, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

CHANGELOG.md CHANGELOG.md +0 -5

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

 ## 10.8.3 (2018-05-30)

-<<<<<<< HEAD
- No changes.
- No changes.
-=======
->>>>>>> upstream/master
 ### Fixed (4 changes)

 - Replace Gitlab::REVISION with Gitlab.revision and handle installations without a .git directory. !19125