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

Fix migration conflict #395

Merged
merged 1 commit into from
Feb 12, 2018
Merged

Fix migration conflict #395

merged 1 commit into from
Feb 12, 2018

Conversation

mbeacom
Copy link
Contributor

@mbeacom mbeacom commented Feb 12, 2018

Description

The goal of this PR is to resolve the migration conflict introduced at: https://github.com/gitcoinco/web/pull/327/files#diff-b4f8f4003f31ce33f37b646c42e12eb5

Checklist
  • linter status: 100% pass
  • changes don't break existing behavior
  • commit message follows commit guidelines
Refers/Fixes

Refs: #327

@codecov
Copy link

codecov bot commented Feb 12, 2018

Codecov Report

❗ No coverage uploaded for pull request base (master@ee27a42). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master     #395   +/-   ##
=========================================
  Coverage          ?   28.34%           
=========================================
  Files             ?       87           
  Lines             ?     4149           
  Branches          ?      498           
=========================================
  Hits              ?     1176           
  Misses            ?     2929           
  Partials          ?       44

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee27a42...05ae753. Read the comment docs.

@mbeacom mbeacom merged commit e669dac into master Feb 12, 2018
@mbeacom mbeacom deleted the fix-migration-conflict branch February 12, 2018 20:50
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.

1 participant