Fix changelog conflict

99f961c3 · Clement Ho · ff308c77 · 99f961c3
Commit 99f961c3 authored May 17, 2017 by Clement Ho
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.4 (2017-05-12)

-<<<<<<< HEAD
-=======
- No changes.
- No changes.
- No changes.
->>>>>>> upstream/master
 - Fix error on CI/CD Settings page related to invalid pipeline trigger. !10948 (dosuken123)
 - Sort the network graph both by commit date and topographically. !11057
 - Fix cross referencing for private and internal projects. !11243