modified to list

faker-ruby · Sep 19, 2019 · b970483 · b970483
1 parent dbbbf62
commit b970483
Showing 1 changed file with 1 addition and 6 deletions.
diff --git 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
+      ]