Fixes conflicts in CHANGELOG.md

77901c1f · Filipa Lacerda · a96959c8 · 77901c1f
Commit 77901c1f authored Mar 29, 2018 by Filipa Lacerda
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.

 ## 10.6.2 (2018-03-29)

-<<<<<<< HEAD
-### Fixed (1 change, 1 of them is from the community)
-
-=======
 ### Fixed (2 changes, 1 of them is from the community)

 - Don't capture trailing punctuation when autolinking. !17965
->>>>>>> upstream/master
 - Cloning a repository over HTTPS with LDAP credentials causes a HTTP 401 Access denied. (Horatiu Eugen Vlad)