From b970483ebd7e067dab044349b080b9a7cc58d541 Mon Sep 17 00:00:00 2001
From: Ashish Rao <ashishrao2598@gmail.com>
Date: Thu, 19 Sep 2019 11:04:07 +0530
Subject: [PATCH] modified to list

---
 lib/locales/en/commerce.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/locales/en/commerce.yml b/lib/locales/en/commerce.yml
index 431482e9bc..820a7e9621 100644
--- a/lib/locales/en/commerce.yml
+++ b/lib/locales/en/commerce.yml
@@ -9,7 +9,6 @@ en:
       promotion_code:
         adjective: ['Amazing', 'Awesome', 'Cool', 'Good', 'Great', 'Incredible', 'Killer', 'Premium', 'Special', 'Stellar', 'Sweet']
         noun: ['Code', 'Deal', 'Discount', 'Price', 'Promo', 'Promotion', 'Sale', 'Savings']
-<<<<<<< HEAD
       brand: ['Samsung',
               'Dell',
               'Nike',
@@ -26,8 +25,4 @@ en:
         'Dollar General',
         'Walmart',
         'Target'
-      ]
-=======
-      brand: ['Samsung', 'Dell', 'Nike', 'Apple', 'LG', 'Adidas', 'Nikon', 'Sony', 'Beats', 'GoPro']
-      vendor: ["Amazon", "Dollar", "General", "Walmart", "Target"]
->>>>>>> add brands and vendors to commerce
+      ]
\ No newline at end of file