diff options
| author | multiple creatures <dev@multiple-creature.party> | 2020-02-21 01:51:53 -0600 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 01:51:53 -0600 |
| commit | 8a60792b01780b4741d1c6de0048bccd9887cb01 (patch) | |
| tree | 18cfaf2c889402ff3fa71e9c4694e5433cac1629 /app | |
| parent | 0a238f34b39b606d5f20e1ef1fbdd2a8c56951db (diff) | |
get rid of stray merge conflict
Diffstat (limited to 'app')
| -rw-r--r-- | app/lib/formatter.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 77b3ac97e..6eea54ec2 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -248,7 +248,6 @@ class Formatter html.html_safe # rubocop:disable Rails/OutputSafety end -<<<<<<< HEAD def format_screenreader(html) html.gsub(/\ufdd3(.*)\ufdd4/m, '<span aria-hidden="true">\1</span>') end |