Skip to content

Conversation

@previsualconsent
Copy link
Contributor

I've finished the merge. I don't know why the pull request cannot be done automatically.

should be up to date with both Simone and my code.

@previsualconsent
Copy link
Contributor Author

For this merge, i just pulled in simoneg90/latest_version and fixed all the conflicts, cleaning up the code a bit as I went. It might be better to rebase the last few commits of simone's branch onto my master, so that the history isn't so messed up.

what do you think Shervin?

@shervin86 shervin86 mentioned this pull request Oct 12, 2015
@previsualconsent
Copy link
Contributor Author

Superseded by #10

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