Skip to content

Fix simple-git version for unhandle promise rejection#2392

Merged
MichMich merged 5 commits intoMagicMirrorOrg:developfrom
sdetweil:fix-update
Dec 31, 2020
Merged

Fix simple-git version for unhandle promise rejection#2392
MichMich merged 5 commits intoMagicMirrorOrg:developfrom
sdetweil:fix-update

Conversation

@sdetweil
Copy link
Collaborator

@sdetweil sdetweil commented Dec 31, 2020

fixes #2383

@sdetweil sdetweil mentioned this pull request Dec 31, 2020
Closed
rejas
rejas approved these changes Dec 31, 2020
View reviewed changes
Copy link
Collaborator

@rejas rejas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like your node-ical update is in here too...

@sdetweil
Copy link
Collaborator Author

sdetweil commented Dec 31, 2020

oops.. didn't make a new branch til too late..

@MichMich
Copy link
Collaborator

MichMich commented Dec 31, 2020

You want me to merge including the node-iCal change?

@sdetweil
Copy link
Collaborator Author

sdetweil commented Dec 31, 2020

yes, then u can just close pr #2390

@MichMich
Copy link
Collaborator

MichMich commented Dec 31, 2020

Ah. It seems it has a merge conflict now which I can't fix in my phone.

@MichMich MichMich mentioned this pull request Dec 31, 2020
Closed
@sdetweil
Copy link
Collaborator Author

sdetweil commented Dec 31, 2020

fixed

@MichMich MichMich merged commit c25b6dc into MagicMirrorOrg:develop Dec 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rejas rejas rejas approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sdetweil @MichMich @rejas