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

pause-resume resolved confilicts #63

Merged
merged 3 commits into from
Feb 20, 2020
Merged

Conversation

mesat
Copy link

@mesat mesat commented Feb 3, 2020

pause-resume resolved conflicts with 9d88270 and fcc2338 for Commits on Dec 23, 2019

@mesat
Copy link
Author

mesat commented Feb 3, 2020

Because of the changed branch, I created a new pull request.

@mesat
Copy link
Author

mesat commented Feb 3, 2020

If it's necessary to continue from #56, I can create from the master of the fork

@mesat mesat requested a review from ctongfei February 3, 2020 13:38
@ctongfei
Copy link
Owner

ctongfei commented Feb 3, 2020

So we could close #56 ? I'll review this soon.

Copy link
Owner

@ctongfei ctongfei left a comment

Choose a reason for hiding this comment

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

Thanks @mesat !

src/main/java/me/tongfei/progressbar/ProgressState.java Outdated Show resolved Hide resolved
src/main/java/me/tongfei/progressbar/ProgressState.java Outdated Show resolved Hide resolved
src/main/java/me/tongfei/progressbar/ProgressBar.java Outdated Show resolved Hide resolved
src/main/java/me/tongfei/progressbar/ProgressBar.java Outdated Show resolved Hide resolved
Muhammet Sakarya added 2 commits February 17, 2020 14:22
changes elapsedSecond type to Duration
fıxes minutes suffix
@mesat mesat requested a review from ctongfei February 19, 2020 08:51
Copy link
Owner

@ctongfei ctongfei left a comment

Choose a reason for hiding this comment

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

Thanks @mesat !

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