mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-08-23 13:24:06 +00:00
Merge conflict.
This commit is contained in:
@@ -143,7 +143,7 @@ Module.register("weather",{
|
||||
humidity: this.indoorHumidity,
|
||||
temperature: this.indoorTemperature
|
||||
}
|
||||
}
|
||||
};
|
||||
},
|
||||
|
||||
// What to do when the weather provider has new information available?
|
||||
@@ -217,7 +217,7 @@ Module.register("weather",{
|
||||
}
|
||||
}
|
||||
} else if (type === "humidity") {
|
||||
value += "%"
|
||||
value += "%";
|
||||
}
|
||||
|
||||
return value;
|
||||
|
Reference in New Issue
Block a user