Resolve conflict in changelog ce-to-ee-2018-11-05

3f6bd640 · Steve Azzopardi · 7ae62fc0 · 3f6bd640
Commit 3f6bd640 authored Nov 05, 2018 by Steve Azzopardi
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,14 +4,9 @@ entry.
 ## 11.4.5 (2018-11-04)
-<<<<<<< HEAD
 ### Fixed (5 changes, 1 of them is from the community)
 - Fix stuck job warning message. !8060
-=======
-### Fixed (4 changes, 1 of them is from the community)
->>>>>>> upstream/master
 - fix link to enable usage ping from convdev index. !22545 (Anand Capur)
 - Update gitlab-ui dependency to 1.8.0-hotfix.1 to fix IE11 bug.
 - Remove duplicate escape in job sidebar.