fix conflicts for CHANGELOG.md

fc11e519 · Filipa Lacerda · a6f3f494 · fc11e519
Commit fc11e519 authored Mar 27, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

CHANGELOG.md CHANGELOG.md +0 -7

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,18 +8,11 @@ entry.

 - Bump rails-html-sanitizer to 1.0.4.

-<<<<<<< HEAD
 ### Fixed (3 changes)

 - Prevent auto-retry AccessDenied error from stopping transition to failed. !17862
 - Fix 500 error when trying to resolve non-ASCII conflicts in the editor. !17962
 - Don't capture trailing punctuation when autolinking. !17965
-=======
-### Fixed (2 changes)
-
- Prevent auto-retry AccessDenied error from stopping transition to failed. !17862
- Fix 500 error when trying to resolve non-ASCII conflicts in the editor. !17962
->>>>>>> upstream/master

 ### Performance (1 change)