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

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