about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/lib/formatter.rb1
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