@sdetweil thank you ! This explanation is very helpful. I’m still a little new to the git environment.

Got it ! git checkout… worked! Thanks for the clarification on what git reset does verses git checkout.

oops meant to type

to clarify… execute “git checkout package-lock.json” instead of " git reset package-lock.json" or execute “git checkout package-lock.json” and " git reset package-lock.json"?

to clarify… execute “git checkout package.json” instead of " git reset package.json" or execute “git checkout package.json” and " git reset package.json"?

@sdetweil Correct. After executing “git reset package-lock.json”, I get the message “Unstaged changes after reset:
M package-lock.json”

I then run git pull and get
pi@MagicMirror:~/MagicMirror/modules/MMM-CalendarExt3 $ git pull

Updating e93534d…5f276d4
error: Your local changes to the following files would be overwritten by merge:
package-lock.json
Please commit your changes or stash them before you merge.
Aborting

@sdetweil I just encountered the same problem and followed your instructions in your last post. This did not fix the problem. I continue to get the same error

“your local changes to the following files would be overwritten by the merge: package-lock.json
please commit them or stash them before you merge.
Aborting.”

Thoughts on what to do next?

Norb

D’oh. I found my issue… I inadvertently typed Config: instead of lower case config:

Issued resolved. Thx for taking time to respond. Sorry to have troubled you.

Norb

I added this configuration code to the clock module portion within config.js. Is that the corct place?

I added this to the clock module portion with in config.js. Is that the correct place?

After updating to latest version of MM I noticed the default clock display the incorrect hour. Exactly 5 hrs ahead. Have been running the same MM pi for 5 plus years with no issue.
Things I’ve done o remedy:

• checked the Raspberry pi localization settings which are set to US - timezone Eastern

• validated pi is displaying correct time

• googled this issue to find that others had corrected this by inserting the following in
  config.js

  config {
  timezone:“America/New_York”,
  }

this did not correct the time.

What do I need to do to get the time to display properly?

After updating to latest version all is fine except for one thing…when hitting the alt kep the bar menu at the top doesn’t appear allowing me to quit MM. Was the eliminated or was the hot key changed?

Norb

@sdetweil Thanks. That redirect was very helpful. Problem solved.

Great Module!! I started customizing a CSS file to enhance the display. I was able to do everything I wanted to do except one mod. I’m trying to make the calendar title font larger on each of 2 calendars, but can’t seem to find where this property is set. Looking for help with this.

Thx Norb

Forgot to include that I have these calendars setup in daily mode

Hi -

I’ve just set up two calendars with custom CSS attributes for color and style for event and slot titles, but find a way to enlarge the view title. I don’t want to change the default font since it’s used in many places. I simply want to enlarge the view title. I gone through the code and default CSS and can’t find where this is set. I’d appreciate help with this .

Thx Norb