noob question I’m tring to update my MM but I’m getting errors
error: Your local changes to the following files would be overwritten by merge:
modules/default/calendar/calendar.js
modules/default/currentweather/currentweather.js
modules/default/weatherforecast/weatherforecast.js
Please, commit your changes or stash them before you can merge.
Aborting
I’m not sure what if anything i changed so how can fix? also what is meant by slashing just putting / around the lines / ?

share please

looks great

1. could you show us what your "yesterdays’ would look like?
2. Is it all teams or just your favourite teams ( if i was to have The peguins and Predators would it show 2 or only 1 time ) Not that, that will ever happen Go WILD !

Thanks Mason I was pulling my hair out trying to figure out why it would not work. works like a charm now…

thanks

Sithas

ok so here is the config all i did was switch out the nyt with the espn.{
module: “newsfeed”,
position: “bottom_bar”,
config: {
feeds: [
{
title: “New York Times”,
url: “http://www.espn.com/espn/rss/nhl/news”
}
],
showSourceTitle: true,
showPublishDate: true
}
when i do that it sits in loading but mirror boots up also i get this
reate new calendar fetcher for url: http://www.calendarlabs.com/templates/ical/US-Holidays.ics - Interval: 300000
Create new news fetcher for url: http://www.espn.com/espn/rss/nhl/news - Interval: 300000
Whoops! There was an uncaught exception…
TypeError: parser.close is not a function
at SAXStream.openf1 (/home/pi/MagicMirror/node_modules/feedme/lib/xmlfeedparser.js:107:14)
at emitOne (events.js:96:13)
at SAXStream.emit (events.js:188:7)
at SAXParser.me._parser.(anonymous function) [as onopentag] (/home/pi/MagicMirror/node_modules/sax/lib/sax.js:258:17)
at emit (/home/pi/MagicMirror/node_modules/sax/lib/sax.js:624:35)
at emitNode (/home/pi/MagicMirror/node_modules/sax/lib/sax.js:629:5)
at openTag (/home/pi/MagicMirror/node_modules/sax/lib/sax.js:825:5)
at SAXParser.write (/home/pi/MagicMirror/node_modules/sax/lib/sax.js:1391:13)
at SAXStream.write (/home/pi/MagicMirror/node_modules/sax/lib/sax.js:239:18)
at module.exports.yoshi.write (/home/pi/MagicMirror/node_modules/feedme/lib/feedme.js:41:14)

any help would be great ive looked all over and nothing i do seems to work

sithas

Ok so i’m tring to change the new york times feed with an espn one (http://www.espn.com/espn/rss/nhl/news). I tried a number of ways and nothing works went back to the first config file and only switched out the url and tile all i get once the MM is up is a loading on the screen were the RSS feed should be help… also is there a way to have 2 or more RSS feeds going at once?

thanks

Sithas