Skip to content

Conversation

@mrseanbaines
Copy link
Contributor

No description provided.

@kazup01
Copy link
Member

kazup01 commented Oct 9, 2017

There is still Conflict. Please check here. https://github.com/BoostIO/Boostnote/pull/951/conflicts

@mrseanbaines
Copy link
Contributor Author

@kazup01 I hope that fixes it - if not, let me know and we can chat on Skype/Slack if you want to try and resolve it.

@kazup01 kazup01 merged commit 6a30627 into BoostIO:master Oct 12, 2017
@kazup01
Copy link
Member

kazup01 commented Oct 12, 2017

Merged. Cool @mrseanbaines , thanks for your contribution !

@kohei-takata kohei-takata mentioned this pull request Oct 28, 2017
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.

3 participants