From aa46aec935c7bbd5fc84f0d61f6468b7622b6cac Mon Sep 17 00:00:00 2001
From: Robin Klaus <rmklaus12@gmail.com>
Date: Fri, 8 May 2020 13:21:47 +1000
Subject: [PATCH] Fix translation keys in en.yml file from previous conflicting
 PRs

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 22c616145a..e2b9db5c43 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3360,6 +3360,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
           unit: "Unit"
       shared:
         sortable_header:
+          name: "Name"
           number: "Number"
           state: "State"
           payment_state: "Payment State"
@@ -3367,9 +3368,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
           email: "Email"
           total: "Total"
       general_settings:
-      shared:
-        sortable_header:
-          name: "Name"
         edit:
           legal_settings: "Legal Settings"
           cookies_consent_banner_toggle: "Display cookies consent banner"