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

resolving merge conflicts for PR(#13) #17

Merged
merged 1 commit into from Jun 4, 2015

Conversation

Projects
None yet
2 participants
@maniotrix
Collaborator

maniotrix commented Jun 4, 2015

No description provided.

josejuansanchez added a commit that referenced this pull request Jun 4, 2015

Merge pull request #17 from maniotrix/gui
resolving merge conflicts for PR(#13)

@josejuansanchez josejuansanchez merged commit a5b5392 into P2PSP:gui Jun 4, 2015

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