about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2020-02-27 14:54:21 -0600
committermultiple creatures <dev@multiple-creature.party>2020-02-27 14:54:21 -0600
commite0baa1e2aacaccf222deace2aa67d63496137536 (patch)
tree68bf12e48475de1fee60f85859b431a1adebf3ff /config
parent3d0370c726f402874f01e476c6add2e5d882ac97 (diff)
resolve stray merge conflict
Diffstat (limited to 'config')
-rw-r--r--config/locales/simple_form.en.yml4
1 files changed, 0 insertions, 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: