From da8e4a4ece93848e89af7013eeb77947fdd5217a Mon Sep 17 00:00:00 2001 From: kytwb Date: Mon, 3 Jan 2022 12:23:20 +0100 Subject: #2383 Fix unaddressed merge conflict --- src/i18n/locales/el.json | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/i18n') diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json index 367ae9712..c801ab978 100644 --- a/src/i18n/locales/el.json +++ b/src/i18n/locales/el.json @@ -286,11 +286,7 @@ "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": "Αναζήτηση υπηρεσίας", -- cgit v1.2.3-70-g09d2