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

    kullboys

    @kullboys

    0
    Reputation
    326
    Profile views
    1
    Posts
    0
    Followers
    0
    Following
    Joined
    Last Online

    kullboys Unfollow Follow

    Latest posts made by kullboys

    • Help! Problem updating to v2.3.1

      Hello everyone
      Just tried to update today to v2.3.1 and got the following error when running “git pull” in the ~/MagicMirror directory

      Removing tests/unit/translations/same_keys.js
      Removing tests/unit/functions/class_spec.js
      Auto-merging modules/default/currentweather/README.md
      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)
      Thanks.

      posted in Troubleshooting
      K
      kullboys