From e0baa1e2aacaccf222deace2aa67d63496137536 Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Thu, 27 Feb 2020 14:54:21 -0600
Subject: resolve stray merge conflict

---
 config/locales/simple_form.en.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 7d57f82ec..224047a69 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -76,12 +76,8 @@ en:
       account_warning_preset:
         text: Preset text
       admin_account_action:
-<<<<<<< HEAD
         send_email_notification: Notify the creature per e-mail
-=======
         include_statuses: Include reported toots in the e-mail
-        send_email_notification: Notify the user per e-mail
->>>>>>> 73ca0bb92... Add option to include reported statuses in warning e-mail (#11639)
         text: Custom warning
         type: Action
         types:
-- 
cgit