Just tried to update today to v2.3.1 and got the following error when running “git pull” in the ~/MagicMirror directory
CONFLICT (content): Merge conflict in modules/default/currentweather/README.md
Automatic merge failed; fix conflicts and then commit the result.
Anyone got any ideas as to what I may be doing wrong ? (I’m running 2 mirrors, and both have the same error)