Hi

Getting this error
pi@raspberrypi:~/MagicMirror $ git pull && npm install
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use ‘git add/rm ’
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

Will appreciate any assistance

@sdetweil . I would like a copy of you code as weel
If possble the Config.js, Main.cssand Custom.css
my email is jbarkhuizen@gmail.com

@yawns
Hi, I copied this to my Config.js
Then I get a syntex error on the position in both scenarios
Appreciate the support

@Wedee, Thanks for taking my message.
I am crazy about your format, but coping the Custom.css just crash my MM completely.
Will someone please share their Main.css, Custom.css and config.js with me on jbarkhuizen@gmail.com

I will appreciate this

Johan