Skip to content
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

Fork and fix merge conflict of PR #18 #40

Closed
wants to merge 4 commits into from
Closed

Fork and fix merge conflict of PR #18 #40

wants to merge 4 commits into from

Conversation

triat
Copy link
Contributor

@triat triat commented Feb 8, 2017

Fix the merge conflict of the PR #18

aschn and others added 4 commits February 8, 2017 09:34
Changes migration file and dependency back to the initial migration file. The project moved forward with a backwards incompatible change and this PR was not updated to reflect that change. All migrations were squashed into the initial migration for simplicity.
@triat triat changed the title Handle 500 Fork and fix merge conflict of PR #18 Feb 8, 2017
@triat triat closed this Feb 9, 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