Commit 77901c1f authored by Filipa Lacerda's avatar Filipa Lacerda

Fixes conflicts in CHANGELOG.md

parent a96959c8
...@@ -4,14 +4,9 @@ entry. ...@@ -4,14 +4,9 @@ entry.
## 10.6.2 (2018-03-29) ## 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) ### Fixed (2 changes, 1 of them is from the community)
- Don't capture trailing punctuation when autolinking. !17965 - 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) - Cloning a repository over HTTPS with LDAP credentials causes a HTTP 401 Access denied. (Horatiu Eugen Vlad)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment