chore: conflicts resolved

vuestorefront · Mar 15, 2021 · 8e80aef · 8e80aef
1 parent 04d6b1d
commit 8e80aef
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/packages/commercetools/theme/lang/de.js b/packages/commercetools/theme/lang/de.js
@@ -118,7 +118,7 @@ export default {
   'Let’s start now – we’ll help you': 'Fangen wir jetzt an - wir helfen Ihnen.',
   'Search results': 'Suchergebnisse',
   'Product suggestions': 'Produktvorschläge',
-  'Search for items': 'Nach Artikeln suchen'
+  'Search for items': 'Nach Artikeln suchen',
   'There is already an existing customer with this email.': 'Es gibt bereits einen Kunden mit dieser E-Mail.',
   'Account with the given credentials not found.': 'Konto mit den angegebenen Anmeldeinformationen nicht gefunden.',
   'Customer account with the given credentials not found.': 'Kundenkonto mit den angegebenen Anmeldeinformationen nicht gefunden.',

diff --git a/packages/commercetools/theme/lang/en.js b/packages/commercetools/theme/lang/en.js
@@ -119,7 +119,6 @@ export default {
   'Search results': 'Search results',
   'Product suggestions': 'Product suggestions',
   'Search for items': 'Search for items',
-  'There is already an existing customer with the email.': 'There is already an existing customer with the email.',
   'There is already an existing customer with this email': 'There is already an existing customer with this email',
   'Account with the given credentials not found.': 'Account with the given credentials not found.',
   'Customer account with the given credentials not found.': 'Customer account with the given credentials not found.',

diff --git a/packages/core/nuxt-theme-module/theme/lang/de.js b/packages/core/nuxt-theme-module/theme/lang/de.js
@@ -118,7 +118,7 @@ export default {
   'Let’s start now – we’ll help you': 'Fangen wir jetzt an - wir helfen Ihnen.',
   'Search results': 'Suchergebnisse',
   'Product suggestions': 'Produktvorschläge',
-  'Search for items': 'Nach Artikeln suchen'
+  'Search for items': 'Nach Artikeln suchen',
   'There is already an existing customer with this email.': 'Es gibt bereits einen Kunden mit dieser E-Mail.',
   'Account with the given credentials not found.': 'Konto mit den angegebenen Anmeldeinformationen nicht gefunden.',
   'Customer account with the given credentials not found.': 'Kundenkonto mit den angegebenen Anmeldeinformationen nicht gefunden.',

diff --git a/packages/core/nuxt-theme-module/theme/lang/en.js b/packages/core/nuxt-theme-module/theme/lang/en.js
@@ -118,8 +118,7 @@ export default {
   'Let’s start now – we’ll help you': 'Let’s start now – we’ll help you.',
   'Search results': 'Search results',
   'Product suggestions': 'Product suggestions',
-  'Search for items': 'Search for items'
-  'There is already an existing customer with the email.': 'There is already an existing customer with the email.',
+  'Search for items': 'Search for items',
   'There is already an existing customer with this email.': 'There is already an existing customer with this email.',
   'Account with the given credentials not found.': 'Account with the given credentials not found.',
   'Customer account with the given credentials not found.': 'Customer account with the given credentials not found.',