Skip to content
This repository was archived by the owner on Jan 6, 2020. It is now read-only.

Conversation

@maqi
Copy link
Contributor

@maqi maqi commented Oct 2, 2014

@dirvine
Copy link
Contributor

dirvine commented Oct 16, 2014

Qi, can you please rebase with next as this pull request has gone bad now.

…//github.com/maqi/Maidsafe-Routing into MAID-143_FUNC_ProcessSend_occasional_failure

Conflicts:
	src/maidsafe/routing/tests/network_utils_test.cc
@maqi
Copy link
Contributor Author

maqi commented Oct 17, 2014

Done, new merge commit pushed to the pull request

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants