Skip to content

Conversation

@menglong567
Copy link
Contributor

You may notice there're much more comflicts within file " src/main/java/multichain/command/StreamCommand.java" and " src/main/java/multichain/command/builders/QueryBuilderStream.java" as below

please don't worry ,that should be caused by the format issue as i'm using netbeans

Actully i ony added some new methods and updated some comments and no existing methods modified

@hubert-marteau
Copy link
Owner

I have to manage the merge with conflicts. I'll try to do it quickly.

hubert-marteau pushed a commit that referenced this pull request Feb 9, 2018
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