Fix merge mistake

5 years ago · 5b746c3538
parent d25ade0f71
commit 5b746c3538
1 changed files with 0 additions and 1 deletions
--- a/config/locales/en.seeders.standard.yml.example
+++ b/config/locales/en.seeders.standard.yml.example
@ -29,7 +29,6 @@ en:
  seeders:
    standard:
      demo_data:
-<<<<<<< HEAD
        attribute_help_texts:
          - attribute_name: 'assignee'
            help_text: |