kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-22 13:09:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix conflict with CHANGELOG, merge with upstream/develop

Browse Source
This commit is contained in:
Andrew McOlash
2017-03-17 07:08:00 -05:00
parent e2099f0749
commit a18e7eb089
24 changed files with 579 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.js.sample
View File

@@ -46,7 +46,7 @@ var config = {
position: "top_right",
config: {
location: "New York",
locationID: "", //ID from http://www.openweathermap.org
locationID: "", //ID from http://www.openweathermap.org/help/city_list.txt
appid: "YOUR_OPENWEATHER_API_KEY"
}
},
@@ -56,7 +56,7 @@ var config = {
header: "Weather Forecast",
config: {
location: "New York",
locationID: "5128581", //ID from http://www.openweathermap.org
locationID: "5128581", //ID from http://www.openweathermap.org/help/city_list.txt
appid: "YOUR_OPENWEATHER_API_KEY"
}
},