Remove unfinished merge stuff

wesbos · Jul 2, 2024 · 27a5133 · 27a5133
1 parent 33e6a84
commit 27a5133
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/emails.txt b/emails.txt
@@ -739,9 +739,6 @@
 9y222.app
 9ya.de
 9yc4hw.us
-<<<<<<< HEAD
-=======
->>>>>>> e8a414f (Add joeroc.com and related domains)
 Liaphoto.com
 a-action.ru
 a-b.co.za