From 8a60792b01780b4741d1c6de0048bccd9887cb01 Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Fri, 21 Feb 2020 01:51:53 -0600
Subject: get rid of stray merge conflict

---
 app/lib/formatter.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app')

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
-- 
cgit