Skip to content

Conversation

@sdetweil
Copy link
Collaborator

@sdetweil sdetweil commented May 9, 2025

@sdetweil
Copy link
Collaborator Author

sdetweil commented May 9, 2025

now.. I LITERALLY JUST pulled develop, and spent 30 minutes creating testcase etc, and NOW I have a merge conflict??

@sdetweil
Copy link
Collaborator Author

sdetweil commented May 9, 2025

I JUST ran prettier on repo

npm run test:prettier

got no error

(base) sam@sams:~/MagicMirror$ npm run test:prettier --write

> magicmirror@2.32.0-develop test:prettier
> prettier . --check

Checking formatting...
All matched files use Prettier code style!

@sdetweil sdetweil changed the title Fix rrule until where event is fullday but rrule until has a non-0 time Fix calendar rrule until where event is fullday but rrule until has a non-0 time May 9, 2025
@sdetweil
Copy link
Collaborator Author

sdetweil commented May 9, 2025

pulled, ran prettier --write, and its ok, so no idea what the problem is.. still passes --check

@khassel khassel merged commit 2422e84 into MagicMirrorOrg:develop May 12, 2025
9 checks passed
@sdetweil sdetweil deleted the fix_until branch August 27, 2025 21:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants