From 30e164fe0afb9aa985a668ddc8b5653e69ca915b Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Mon, 21 Sep 2020 12:21:08 +0200 Subject: [PATCH] Fix merge conflict. --- translations/nl.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/translations/nl.json b/translations/nl.json index 28da61ba..7845ba9e 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -28,11 +28,5 @@ "UPDATE_NOTIFICATION_MODULE": "Update beschikbaar voor {MODULE_NAME} module.", "UPDATE_INFO_SINGLE": "De huidige installatie loopt {COMMIT_COUNT} commit achter op de {BRANCH_NAME} branch.", "UPDATE_INFO_MULTIPLE": "De huidige installatie loopt {COMMIT_COUNT} commits achter op de {BRANCH_NAME} branch.", -<<<<<<< HEAD - "FEELS": "Voelt als" -======= - - "FEELS": "Gevoelstemperatuur" ->>>>>>> upstream/develop }