MagicMirror Forum
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • 3rd-Party-Modules
    • Donate
    • Discord
    • Register
    • Login
    1. Home
    2. mmohrmann
    A New Chapter for MagicMirror: The Community Takes the Lead
    Read the statement by Michael Teeuw here.
    M
    • Profile
    • Following 0
    • Followers 0
    • Topics 2
    • Posts 3
    • Best 0
    • Controversial 0
    • Groups 0

    mmohrmann

    @mmohrmann

    0
    Reputation
    1
    Profile views
    3
    Posts
    0
    Followers
    0
    Following
    Joined Last Online
    mmohrmann Unfollow Follow

    Latest posts made by mmohrmann

    • Calendar only updates with restart

      I’m using my google calendar to see events on my magic mirror. It suddenly stopped updating three weeks ago. The only way for me to get the events to be current is to quit, then . When it loads, everything is great. It will say I have a meeting in 2 hours. But the next day, it still says I have a meeting in 2 hours. Any suggestions on how to get it to update? Thanks in advance for your help!

      Module.register(“MMM-MyCalendar”, {

      // Define module defaults
defaults: {
	maximumEntries: 10, // Total Maximum Entries
	maximumNumberOfDays: 365,
	displaySymbol: true,
	defaultSymbol: "calendar", // Fontawesome Symbol see http://fontawesome.io/cheatsheet/
	displayRepeatingCountTitle: false,
	defaultRepeatingCountTitle: "",
	maxTitleLength: 25,
	fetchInterval: 5 * 60 * 1000, // Update every 5 minutes.
	animationSpeed: 2000,
	fade: true,
	urgency: 7,
	useRelativeDates: false,
	dayOfWeekFormat: "dddd",
	dateFormat: "MMMM D",
	timeFormat: "h:mm A",
	joiningWord: "at",
	getRelative: 6,
	fadePoint: 0.25, // Start on 1/4th of the list.
	hidePrivate: false,
	colored: false,
	calendars: [
		{
			symbol: "calendar",
			url: "http://www.calendarlabs.com/templates/ical/US-Holidays.ics",
		},
	],
	titleReplace: {
		"De verjaardag van ": "",
		"'s birthday": ""
	},
	broadcastEvents: true,
	excludedEvents: [],
showLocation: true
},
      posted in Troubleshooting
      M
      mmohrmann
    • RE: Updated MM will not display

      @sdetweil Thank you! npm install rrule worked. My changes didn’t merge over, but at least I have the default MM running. THANKS!

      posted in Forum
      M
      mmohrmann
    • Updated MM will not display

      I updated Magic Mirror this morning and now it just displays a blank screen. Thank you in advance for your help with this!

      First I ran cp -r ~/MagicMirror ~/MM-Backup
      git stash
      git pull
      npm install
      git stash apply

      Then npm run start and it just gives me a blank screen.

      I have tried:

      pi@raspberrypi:~/MagicMirror $ npm install valid -url
      npm WARN EBADENGINE Unsupported engine { package: ‘magicmirror@2.16.0’,
      npm WARN EBADENGINE required: { node: ‘>=12’ },
      npm WARN EBADENGINE current: { node: ‘v10.23.2’, npm: ‘7.5.2’ } }
      npm WARN EBADENGINE Unsupported engine { package: ‘eslint-plugin-jsdoc@35.4.0’,
      npm WARN EBADENGINE required: { node: ‘>=12’ },
      npm WARN EBADENGINE current: { node: ‘v10.23.2’, npm: ‘7.5.2’ } }
      npm WARN EBADENGINE Unsupported engine { package: ‘jsdoc-type-pratt-parser@1.0.4’,
      npm WARN EBADENGINE required: { node: ‘>=12.0.0’ },
      npm WARN EBADENGINE current: { node: ‘v10.23.2’, npm: ‘7.5.2’ } }

      added 3 packages, and audited 926 packages in 6s

      110 packages are looking for funding
      run npm fund for details

      found 0 vulnerabilities

      pi@raspberrypi:~/MagicMirror $ npm run start

      magicmirror@2.16.0 start
      DISPLAY=“${DISPLAY:=:0}” ./node_modules/.bin/electron js/electron.js

      [17.09.2021 05:36.25.670] [LOG] Starting MagicMirror: v2.16.0
      [17.09.2021 05:36.25.675] [LOG] Loading config …
      [17.09.2021 05:36.25.682] [LOG] Loading module helpers …
      [17.09.2021 05:36.25.684] [LOG] No helper found for module: alert.
      [17.09.2021 05:36.25.853] [LOG] Initializing new module helper …
      [17.09.2021 05:36.25.854] [LOG] Module helper loaded: updatenotification
      [17.09.2021 05:36.25.855] [LOG] No helper found for module: clock.
      [17.09.2021 05:36.26.076] [LOG] Initializing new module helper …
      [17.09.2021 05:36.26.077] [LOG] Module helper loaded: MMM-Remote-Control
      [17.09.2021 05:36.26.417] [ERROR] WARNING! Could not load config file. Starting with default configuration. Error found: Error: Cannot find module ‘rrule-alt’
      Require stack:

      • /home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/node-ical.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/index.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/calendarfetcher.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/node_helper.js
      • /home/pi/MagicMirror/js/app.js
      • /home/pi/MagicMirror/js/electron.js
      • /home/pi/MagicMirror/node_modules/electron/dist/resources/default_app.asar/main.js

      [17.09.2021 05:36.26.418] [LOG] Loading module helpers …
      [17.09.2021 05:36.26.419] [LOG] No helper found for module: alert.
      [17.09.2021 05:36.26.419] [LOG] Initializing new module helper …
      [17.09.2021 05:36.26.420] [LOG] Module helper loaded: updatenotification
      [17.09.2021 05:36.26.420] [LOG] No helper found for module: clock.
      [17.09.2021 05:36.26.421] [LOG] Initializing new module helper …
      [17.09.2021 05:36.26.422] [LOG] Module helper loaded: MMM-Remote-Control
      [17.09.2021 05:36.26.426] [ERROR] App threw an error during load
      [17.09.2021 05:36.26.429] [ERROR] Error: Cannot find module ‘rrule-alt’
      Require stack:

      • /home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/node-ical.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/index.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/calendarfetcher.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/node_helper.js
      • /home/pi/MagicMirror/js/app.js
      • /home/pi/MagicMirror/js/electron.js
      • /home/pi/MagicMirror/node_modules/electron/dist/resources/default_app.asar/main.js
      • at Module._resolveFilename (internal/modules/cjs/loader.js:972:15)
        at Function.n._resolveFilename (electron/js2c/browser_init.js:249:921)
        at Function.Module._resolveFilename (/home/pi/MagicMirror/node_modules/module-alias/index.js:49:29)
        at Module._load (internal/modules/cjs/loader.js:848:27)
        at Function.f._load (electron/js2c/asar_bundle.js:5:12633)
        at Module.require (internal/modules/cjs/loader.js:1032:19)
        at require (internal/modules/cjs/helpers.js:72:18)
        at Object. (/home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/node-ical.js:20:13)
        at Module._compile (internal/modules/cjs/loader.js:1152:30)
        at Object.Module._extensions…js (internal/modules/cjs/loader.js:1173:10)
        [17.09.2021 05:36.26.430] [ERROR] Whoops! There was an uncaught exception…
        [17.09.2021 05:36.26.439] [ERROR] Error: Cannot find module ‘rrule-alt’
        Require stack:
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/node-ical.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/index.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/calendarfetcher.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/node_helper.js
      • /home/pi/MagicMirror/js/app.js
      • /home/pi/MagicMirror/js/electron.js
      • /home/pi/MagicMirror/node_modules/electron/dist/resources/default_app.asar/main.js
      • at Module._resolveFilename (internal/modules/cjs/loader.js:972:15)
        at Function.n._resolveFilename (electron/js2c/browser_init.js:249:921)
        at Function.Module._resolveFilename (/home/pi/MagicMirror/node_modules/module-alias/index.js:49:29)
        at Module._load (internal/modules/cjs/loader.js:848:27)
        at Function.f._load (electron/js2c/asar_bundle.js:5:12633)
        at Module.require (internal/modules/cjs/loader.js:1032:19)
        at require (internal/modules/cjs/helpers.js:72:18)
        at Object. (/home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/node-ical.js:20:13)
        at Module._compile (internal/modules/cjs/loader.js:1152:30)
        at Object.Module._extensions…js (internal/modules/cjs/loader.js:1173:10) {
        code: ‘MODULE_NOT_FOUND’,
        requireStack: [
        ‘/home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/node-ical.js’,
        ‘/home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/index.js’,
        ‘/home/pi/MagicMirror/modules/MMM-MyCalendar/calendarfetcher.js’,
        ‘/home/pi/MagicMirror/modules/MMM-MyCalendar/node_helper.js’,
        ‘/home/pi/MagicMirror/js/app.js’,
        ‘/home/pi/MagicMirror/js/electron.js’,
        ‘/home/pi/MagicMirror/node_modules/electron/dist/resources/default_app.asar/main.js’,
        undefined
        ]
        }
        [17.09.2021 05:36.26.442] [ERROR] MagicMirror will not quit, but it might be a good idea to check why this happened. Maybe no internet connection?
        [17.09.2021 05:36.26.442] [ERROR] If you think this really is an issue, please open an issue on GitHub: https://github.com/MichMich/MagicMirror/issues
        [17.09.2021 05:36.26.701] [LOG] Launching application.
        [17.09.2021 05:38.09.120] [LOG] Shutting down server…
        [17.09.2021 05:38.09.125] [LOG] Stopping module helper: updatenotification
        [17.09.2021 05:38.09.126] [ERROR] Whoops! There was an uncaught exception…
        [17.09.2021 05:38.09.131] [ERROR] TypeError: Cannot convert undefined or null to object
        at Function.keys ()
        at Class.stop (/home/pi/MagicMirror/modules/MMM-Remote-Control/node_helper.js:71:20)
        at App.stop (/home/pi/MagicMirror/js/app.js:253:16)
        at App. (/home/pi/MagicMirror/js/electron.js:128:7)
        at App.emit (events.js:315:20)
        at appMethod (electron/js2c/browser_init.js:69:1768)
        at Object.execute (electron/js2c/browser_init.js:69:4932)
        at MenuItem.click (electron/js2c/browser_init.js:73:1637)
        at Object.a._executeCommand (electron/js2c/browser_init.js:81:2343)
        [17.09.2021 05:38.09.133] [ERROR] MagicMirror will not quit, but it might be a good idea to check why this happened. Maybe no internet connection?
        [17.09.2021 05:38.09.134] [ERROR] If you think this really is an issue, please open an issue on GitHub: https://github.com/MichMich/MagicMirror/issues
        pi@raspberrypi:~/MagicMirror $ git stash pop
        css/main.css: needs merge
        modules/default/calendar/calendar.css: needs merge
        modules/default/calendar/calendar.js: needs merge
        modules/default/calendar/calendarfetcher.js: needs merge
        modules/default/calendar/node_helper.js: needs merge
        modules/default/newsfeed/newsfeed.js: needs merge
        modules/default/newsfeed/newsfeedfetcher.js: needs merge
        modules/default/newsfeed/node_helper.js: needs merge
        modules/default/updatenotification/updatenotification.js: needs merge
        modules/default/weather/weather.js: needs merge
        modules/default/weatherforecast/weatherforecast.js: needs merge
        unable to refresh index
        pi@raspberrypi:~/MagicMirror $ git stash apply
        css/main.css: needs merge
        modules/default/calendar/calendar.css: needs merge
        modules/default/calendar/calendar.js: needs merge
        modules/default/calendar/calendarfetcher.js: needs merge
        modules/default/calendar/node_helper.js: needs merge
        modules/default/newsfeed/newsfeed.js: needs merge
        modules/default/newsfeed/newsfeedfetcher.js: needs merge
        modules/default/newsfeed/node_helper.js: needs merge
        modules/default/updatenotification/updatenotification.js: needs merge
        modules/default/weather/weather.js: needs merge
        modules/default/weatherforecast/weatherforecast.js: needs merge
        unable to refresh index
        pi@raspberrypi:~/MagicMirror $ npm install
        npm WARN EBADENGINE Unsupported engine { package: ‘magicmirror@2.16.0’,
        npm WARN EBADENGINE required: { node: ‘>=12’ },
        npm WARN EBADENGINE current: { node: ‘v10.23.2’, npm: ‘7.5.2’ } }
        npm WARN EBADENGINE Unsupported engine { package: ‘eslint-plugin-jsdoc@35.4.0’,
        npm WARN EBADENGINE required: { node: ‘>=12’ },
        npm WARN EBADENGINE current: { node: ‘v10.23.2’, npm: ‘7.5.2’ } }
        npm WARN EBADENGINE Unsupported engine { package: ‘jsdoc-type-pratt-parser@1.0.4’,
        npm WARN EBADENGINE required: { node: ‘>=12.0.0’ },
        npm WARN EBADENGINE current: { node: ‘v10.23.2’, npm: ‘7.5.2’ } }

      magicmirror@2.16.0 install
      echo "Installing vendor files …
      " && cd vendor && npm install --loglevel=error

      Installing vendor files …

      up to date, audited 10 packages in 1s

      found 0 vulnerabilities

      magicmirror@2.16.0 postinstall
      npm run install-fonts && echo "MagicMirror installation finished successfully!
      "

      magicmirror@2.16.0 install-fonts
      echo "Installing fonts …
      " && cd fonts && npm install --loglevel=error

      Installing fonts …

      up to date, audited 2 packages in 1s

      found 0 vulnerabilities
      MagicMirror installation finished successfully!

      magicmirror@2.16.0 prepare
      [ -f node_modules/.bin/husky ] && husky install || echo no husky installed.

      husky - Git hooks installed

      up to date, audited 926 packages in 9s

      110 packages are looking for funding
      run npm fund for details

      found 0 vulnerabilities
      pi@raspberrypi:~/MagicMirror $ npm run start

      magicmirror@2.16.0 start
      DISPLAY=“${DISPLAY:=:0}” ./node_modules/.bin/electron js/electron.js

      [17.09.2021 05:41.44.149] [LOG] Starting MagicMirror: v2.16.0
      [17.09.2021 05:41.44.154] [LOG] Loading config …
      [17.09.2021 05:41.44.160] [LOG] Loading module helpers …
      [17.09.2021 05:41.44.163] [LOG] No helper found for module: alert.
      [17.09.2021 05:41.44.336] [LOG] Initializing new module helper …
      [17.09.2021 05:41.44.337] [LOG] Module helper loaded: updatenotification
      [17.09.2021 05:41.44.338] [LOG] No helper found for module: clock.
      [17.09.2021 05:41.44.553] [LOG] Initializing new module helper …
      [17.09.2021 05:41.44.553] [LOG] Module helper loaded: MMM-Remote-Control
      [17.09.2021 05:41.44.887] [ERROR] WARNING! Could not load config file. Starting with default configuration. Error found: Error: Cannot find module ‘rrule-alt’
      Require stack:

      • /home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/node-ical.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/index.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/calendarfetcher.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/node_helper.js
      • /home/pi/MagicMirror/js/app.js
      • /home/pi/MagicMirror/js/electron.js
      • /home/pi/MagicMirror/node_modules/electron/dist/resources/default_app.asar/main.js

      [17.09.2021 05:41.44.888] [LOG] Loading module helpers …
      [17.09.2021 05:41.44.889] [LOG] No helper found for module: alert.
      [17.09.2021 05:41.44.890] [LOG] Initializing new module helper …
      [17.09.2021 05:41.44.890] [LOG] Module helper loaded: updatenotification
      [17.09.2021 05:41.44.891] [LOG] No helper found for module: clock.
      [17.09.2021 05:41.44.892] [LOG] Initializing new module helper …
      [17.09.2021 05:41.44.892] [LOG] Module helper loaded: MMM-Remote-Control
      [17.09.2021 05:41.44.897] [ERROR] App threw an error during load
      [17.09.2021 05:41.44.900] [ERROR] Error: Cannot find module ‘rrule-alt’
      Require stack:

      • /home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/node-ical.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/index.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/calendarfetcher.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/node_helper.js
      • /home/pi/MagicMirror/js/app.js
      • /home/pi/MagicMirror/js/electron.js
      • /home/pi/MagicMirror/node_modules/electron/dist/resources/default_app.asar/main.js
      • at Module._resolveFilename (internal/modules/cjs/loader.js:972:15)
        at Function.n._resolveFilename (electron/js2c/browser_init.js:249:921)
        at Function.Module._resolveFilename (/home/pi/MagicMirror/node_modules/module-alias/index.js:49:29)
        at Module._load (internal/modules/cjs/loader.js:848:27)
        at Function.f._load (electron/js2c/asar_bundle.js:5:12633)
        at Module.require (internal/modules/cjs/loader.js:1032:19)
        at require (internal/modules/cjs/helpers.js:72:18)
        at Object. (/home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/node-ical.js:20:13)
        at Module._compile (internal/modules/cjs/loader.js:1152:30)
        at Object.Module._extensions…js (internal/modules/cjs/loader.js:1173:10)
        [17.09.2021 05:41.44.902] [ERROR] Whoops! There was an uncaught exception…
        [17.09.2021 05:41.44.910] [ERROR] Error: Cannot find module ‘rrule-alt’
        Require stack:
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/node-ical.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/index.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/calendarfetcher.js
      • /home/pi/MagicMirror/modules/MMM-MyCalendar/node_helper.js
      • /home/pi/MagicMirror/js/app.js
      • /home/pi/MagicMirror/js/electron.js
      • /home/pi/MagicMirror/node_modules/electron/dist/resources/default_app.asar/main.js
      • at Module._resolveFilename (internal/modules/cjs/loader.js:972:15)
        at Function.n._resolveFilename (electron/js2c/browser_init.js:249:921)
        at Function.Module._resolveFilename (/home/pi/MagicMirror/node_modules/module-alias/index.js:49:29)
        at Module._load (internal/modules/cjs/loader.js:848:27)
        at Function.f._load (electron/js2c/asar_bundle.js:5:12633)
        at Module.require (internal/modules/cjs/loader.js:1032:19)
        at require (internal/modules/cjs/helpers.js:72:18)
        at Object. (/home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/node-ical.js:20:13)
        at Module._compile (internal/modules/cjs/loader.js:1152:30)
        at Object.Module._extensions…js (internal/modules/cjs/loader.js:1173:10) {
        code: ‘MODULE_NOT_FOUND’,
        requireStack: [
        ‘/home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/node-ical.js’,
        ‘/home/pi/MagicMirror/modules/MMM-MyCalendar/vendor/ical.js/index.js’,
        ‘/home/pi/MagicMirror/modules/MMM-MyCalendar/calendarfetcher.js’,
        ‘/home/pi/MagicMirror/modules/MMM-MyCalendar/node_helper.js’,
        ‘/home/pi/MagicMirror/js/app.js’,
        ‘/home/pi/MagicMirror/js/electron.js’,
        ‘/home/pi/MagicMirror/node_modules/electron/dist/resources/default_app.asar/main.js’,
        undefined
        ]
        }
        [17.09.2021 05:41.44.913] [ERROR] MagicMirror will not quit, but it might be a good idea to check why this happened. Maybe no internet connection?
        [17.09.2021 05:41.44.914] [ERROR] If you think this really is an issue, please open an issue on GitHub: https://github.com/MichMich/MagicMirror/issues
        [17.09.2021 05:41.45.186] [LOG] Launching application.
        [17.09.2021 05:42.23.243] [LOG] Shutting down server…
        [17.09.2021 05:42.23.247] [LOG] Stopping module helper: updatenotification
        [17.09.2021 05:42.23.249] [ERROR] Whoops! There was an uncaught exception…
        [17.09.2021 05:42.23.254] [ERROR] TypeError: Cannot convert undefined or null to object
        at Function.keys ()
        at Class.stop (/home/pi/MagicMirror/modules/MMM-Remote-Control/node_helper.js:71:20)
        at App.stop (/home/pi/MagicMirror/js/app.js:253:16)
        at App. (/home/pi/MagicMirror/js/electron.js:128:7)
        at App.emit (events.js:315:20)
        at appMethod (electron/js2c/browser_init.js:69:1768)
        at Object.execute (electron/js2c/browser_init.js:69:4932)
        at MenuItem.click (electron/js2c/browser_init.js:73:1637)
        at Object.a._executeCommand (electron/js2c/browser_init.js:81:2343)
        [17.09.2021 05:42.23.255] [ERROR] MagicMirror will not quit, but it might be a good idea to check why this happened. Maybe no internet connection?
        [17.09.2021 05:42.23.257] [ERROR] If you think this really is an issue, please open an issue on GitHub: https://github.com/MichMich/MagicMirror/issues
        pi@raspberrypi:~/MagicMirror $ git pull
        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.

      pi@raspberrypi:~/MagicMirror $ git status
      On branch master
      Your branch is up to date with ‘origin/master’.

      Changes to be committed:
      (use “git reset HEAD …” to unstage)

      modified:   modules/default/clock/clock.js
modified:   modules/default/compliments/compliments.js
modified:   modules/default/currentweather/README.md
modified:   modules/default/currentweather/currentweather.css
modified:   modules/default/currentweather/currentweather.js
modified:   modules/default/updatenotification/node_helper.js
modified:   modules/default/weather/current.njk
modified:   modules/default/weather/forecast.njk
modified:   modules/default/weather/hourly.njk
modified:   modules/default/weather/providers/README.md
modified:   modules/default/weather/providers/darksky.js
modified:   modules/default/weather/providers/openweathermap.js
modified:   modules/default/weather/providers/smhi.js
modified:   modules/default/weather/providers/ukmetoffice.js
modified:   modules/default/weather/providers/ukmetofficedatahub.js
modified:   modules/default/weather/providers/weatherbit.js
modified:   modules/default/weather/providers/weathergov.js
modified:   modules/default/weather/weatherprovider.js
modified:   modules/default/weatherforecast/README.md

      Unmerged paths:
      (use “git reset HEAD …” to unstage)
      (use “git add …” to mark resolution)

      both modified:   css/main.css
both modified:   modules/default/calendar/calendar.css
both modified:   modules/default/calendar/calendar.js
both modified:   modules/default/calendar/calendarfetcher.js
both modified:   modules/default/calendar/node_helper.js
both modified:   modules/default/newsfeed/newsfeed.js
both modified:   modules/default/newsfeed/newsfeedfetcher.js
both modified:   modules/default/newsfeed/node_helper.js
both modified:   modules/default/updatenotification/updatenotification.js
both modified:   modules/default/weather/weather.js
both modified:   modules/default/weatherforecast/weatherforecast.js

      Changes not staged for commit:
      (use “git add …” to update what will be committed)
      (use “git checkout – …” to discard changes in working directory)

      modified:   package-lock.json
modified:   package.json

      pi@raspberrypi:~/MagicMirror $ git reset --merge
      pi@raspberrypi:~/MagicMirror $ git status
      On branch master
      Your branch is up to date with ‘origin/master’.

      Changes not staged for commit:
      (use “git add …” to update what will be committed)
      (use “git checkout – …” to discard changes in working directory)

      modified:   package-lock.json
modified:   package.json

      no changes added to commit (use “git add” and/or “git commit -a”)```

      posted in Forum
      M
      mmohrmann