kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge conflict.

Browse Source
This commit is contained in:
Michael Teeuw 2020-09-21 12:21:08 +02:00
parent 24eac7ef41
commit 30e164fe0a
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
translations/nl.json
View File

@ -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
}