v2.1.1 Update Error

[lucallmon]

@yawns so what do I do to get rid of the error then?

[mochman]

@lucallmon If you don’t care about the changes you made to those files then you can run
git stash from your MagicMirror directory. You should be able to run the git pull command after that.

If you want to keep them, I’d just copy those files to somewhere not in your MagicMirror directory, run the stash command, pull the new MM, and put them back if you think they aren’t going to break anything in 2.1.1

[lucallmon]

@strawberry-3.141 this worked! Thanks!