Update says to "commit your changes or stash them before you can merge." ?

strawberry 3.141

@Richard238 yes this should colorize the calendar icon fa-calendar-check-o in your first instance and fa-trash-o in your second.

Richard238

This post is deleted!

strawberry 3.141

@Richard238 check the part between calendar and compliments module

Richard238

@strawberry-3.141 I’ve no idea what I’m looking for, sorry…

Richard238

Just tried the default sample config.js, and that doesn’t work either!

strawberry 3.141

@Richard238 you pasted the start function into your config file, but if the config sample doesnt work either your problem is somewhere else

Richard238

Powered off & on, default config OK, and mine too.

But, cannot see Mirror from PC, despite full whitelisting in config.

ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.1/120",],

Richard238

And suddenly it come back into life! :)

pepemujica

@yawns Hi! I’ve never change neither te default modules or the main.css. Any idea why I get the same error?

bminer1

@yawns I dont know what im doing wrong. Trying to follow your Option 2.

pi@raspberrypi:~/MagicMirror $ git reset
Unstaged changes after reset:
M	css/custom.css
M	modules/default/alert/alert.js
M	modules/default/calendar/calendar.css
M	modules/default/calendar/calendar.js
M	modules/default/currentweather/currentweather.js
M	modules/default/weatherforecast/weatherforecast.js
pi@raspberrypi:~/MagicMirror $ git pull
Updating 8010e62..5c41e24
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