fix: error translation

naturalsolutions · Oct 11, 2021 · 53bb3b1 · 53bb3b1
1 parent 541cf11
commit 53bb3b1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/frontend/public/locales/es/components.json b/frontend/public/locales/es/components.json
@@ -861,11 +861,8 @@
   },
   "r": {
     "caption": ""
-<<<<<<< HEAD
-=======
   },
   "SearchCity": {
     "placeholder": "Busca los árboles de una ciudad..."
->>>>>>> dev
   }
 }
diff --git a/frontend/public/locales/fr/components.json b/frontend/public/locales/fr/components.json
@@ -860,11 +860,8 @@
   },
   "r": {
     "caption": ""
-<<<<<<< HEAD
-=======
   },
   "SearchCity": {
     "placeholder": "Explorez les arbres d'une ville..."
->>>>>>> dev
   }
 }