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

Fixed some grammatical mistakes in the comments in junit.framework #1184

Merged
merged 10 commits into from
Oct 28, 2016

Conversation

haifeng-jin
Copy link
Contributor

No description provided.

@stefanbirkner
Copy link
Contributor

LGTM

@haifeng-jin
Copy link
Contributor Author

@marcphilipp Should this be merged?

@kcooney
Copy link
Member

kcooney commented Sep 18, 2016

I suspect this wasn't merged because git didn't provide a good UI to squash commits. If the conflicts can be resolved, I'd be happy to merge it.

@PeterWippermann
Copy link
Contributor

@jhfjhfj1 Maybe you can do a rebase to have the merge conflicts disappear? Don't let your effort go to waste :-)

@haifeng-jin
Copy link
Contributor Author

@kcooney @PeterWippermann Thank you guys!
I have solved the conflicts.

@kcooney kcooney merged commit 140f1cd into junit-team:master Oct 28, 2016
@PeterWippermann
Copy link
Contributor

Well done! Congratulations @jhfjhfj1 👍 :-)

@kcooney kcooney modified the milestone: 4.13 Aug 6, 2017
sebasjm pushed a commit to sebasjm/junit4 that referenced this pull request Mar 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants