Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert unwanted removals from previous PR #99 #113

Merged
merged 3 commits into from
May 20, 2022

Conversation

florian-h05
Copy link
Contributor

This reverts the removal of time.ZonedDateTime.millisFromNow() and
Timer docs from the README from PR #99.

Signed-off-by: Florian Hotze florianh_dev@icloud.com

This reverts the removal of `time.ZonedDateTime.millisFromNow()` and
Timer docs from the README from PR openhab#99.

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
@digitaldan
Copy link
Contributor

Hi @florian-h05 i fixed just merged #101 which has now caused conflicts here, can you fix those and i will merge this? Then we can look at formatting the code base in #107

1 similar comment
@digitaldan
Copy link
Contributor

Hi @florian-h05 i fixed just merged #101 which has now caused conflicts here, can you fix those and i will merge this? Then we can look at formatting the code base in #107

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
@florian-h05
Copy link
Contributor Author

florian-h05 commented May 13, 2022

@digitaldan
Should be ready to merge now.

I took the liberty to rename from millisFromNow() to getMillisFromNow().

Copy link
Contributor

@digitaldan digitaldan left a comment

Choose a reason for hiding this comment

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

LGTM!

@digitaldan digitaldan merged commit e3b4e68 into openhab:main May 20, 2022
@florian-h05 florian-h05 deleted the revert-unwanted-removals branch May 20, 2022 16:52
@florian-h05 florian-h05 added this to the 1.2.4 milestone May 27, 2022
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