Fixed duplicate lines from merges

mage-os · Feb 12, 2025 · 4c2a6fa · 4c2a6fa
1 parent 3c03d69
commit 4c2a6fa
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 8 deletions.
diff --git a/app/design/adminhtml/Magento/backend/i18n/en_US.csv b/app/design/adminhtml/Magento/backend/i18n/en_US.csv
@@ -549,4 +549,3 @@ Dashboard,Dashboard
 "Email to a Friend","Email to a Friend"
 "Invalid data type","Invalid data type"
 "Invalid value provided for attribute %1","Invalid value provided for attribute %1"
-"Invalid data type","Invalid data type"
diff --git a/app/design/frontend/Magento/luma/i18n/en_US.csv b/app/design/frontend/Magento/luma/i18n/en_US.csv
@@ -490,5 +490,3 @@ Test,Test
 test,test
 Two,Two
 "Invalid data type","Invalid data type"
-"Invalid data type","Invalid data type"
-"Invalid data type","Invalid data type"
diff --git a/...ts/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/...ts/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
@@ -26,11 +26,6 @@ class SaveTest extends AbstractCreditmemoControllerTest
      */
     protected $resource = 'Magento_Sales::creditmemo';
 
-    /**
-     * @var string
-     */
-    protected $resource = 'Magento_Sales::creditmemo';
-
     /**
      * @var string
      */