1 files changed, 4 insertions, 0 deletions

diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index c801ab978..367ae9712 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -286,7 +286,11 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Διαθέσιμες υπηρεσίες",
   "settings.recipes.missingService": "Λείπει κάποια υπηρεσία;",
+<<<<<<< HEAD
+  "settings.recipes.mostPopular": "Most popular",
+=======
   "settings.recipes.mostPopular": "Τα πιο δημοφιλή",
+>>>>>>> develop
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Η υπηρεσία προστέθηκε με επιτυχία",
   "settings.searchService": "Αναζήτηση υπηρεσίας",