Skip to content

Conversation

@johnjaylward
Copy link
Contributor

same tests as in #58, but updated for changes made in stleary/JSON-java#272

@stleary
Copy link
Owner

stleary commented Sep 9, 2016

@johnjaylward The JSON-Java changes have been merged. Do you want to fix the merge conflicts, or shall I push with the same changes you are proposing here, plus the merge conflict fixes?

@johnjaylward
Copy link
Contributor Author

work is pretty busy now. If you can handle the merge conflicts that would be great.

@stleary
Copy link
Owner

stleary commented Sep 9, 2016

No worries, will do.

@stleary stleary mentioned this pull request Sep 16, 2016
@stleary
Copy link
Owner

stleary commented Sep 16, 2016

Conflicts resolved in #60.

@stleary stleary closed this Sep 16, 2016
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