Fixes conflicts for CHANGELOG.md

702168ff · Filipa Lacerda · 7bdb50d8 · 702168ff
Commit 702168ff authored Oct 18, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

CHANGELOG.md CHANGELOG.md +0 -3

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,6 @@ documentation](doc/development/changelog.md) for instructions on adding your own
 entry.

 ## 11.3.6 (2018-10-17)
-<<<<<<< HEAD
-=======

 - No changes.

@@ -14,7 +12,6 @@ entry.

 - Fix loading issue on some merge request discussion. !21982
 - Fix project deletion when there is a export available. !22276
->>>>>>> upstream/master

 - No changes.