Merge conflict.

This commit is contained in:
Michael Teeuw
2019-06-14 13:19:29 +02:00
70 changed files with 2261 additions and 2633 deletions

View File

@@ -25,7 +25,6 @@
"WNW": "VNV",
"NW": "NV",
"NNW": "NNV",
"FEELS": "Känns som",
"UPDATE_NOTIFICATION": "MagicMirror² uppdatering finns tillgänglig.",
"UPDATE_NOTIFICATION_MODULE": "Uppdatering finns tillgänglig av {MODULE_NAME} modulen.",

View File

@@ -45,4 +45,3 @@ var translations = {
if (typeof module !== "undefined") {module.exports = translations;}