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

[conflict_resolver] loading data is incomplete #2988

Closed
wants to merge 3 commits into from

Conversation

kongtiaowang
Copy link
Contributor

@kongtiaowang kongtiaowang commented Jul 26, 2017

#2878 has wrong rebase for these two files.
Redmine ticket is here.
https://redmine.cbrain.mcgill.ca/issues/12873

@kongtiaowang kongtiaowang added this to the 17.1 milestone Jul 26, 2017
@kongtiaowang kongtiaowang added the Bug PR or issue introducing/requiring bug fixes (not mutually exclusive with the Feature label) label Jul 26, 2017
@kongtiaowang kongtiaowang changed the title [conflict resolver] loading data is incomplete [conflict_resolver] loading data is incomplete Jul 26, 2017
@kongtiaowang kongtiaowang added the Needs Work PR awaiting additional changes by the author or contains issues that the author needs to fix label Jul 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug PR or issue introducing/requiring bug fixes (not mutually exclusive with the Feature label) Needs Work PR awaiting additional changes by the author or contains issues that the author needs to fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant