-
Notifications
You must be signed in to change notification settings - Fork 58
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
Remove copy of Niworkflows in favor of dependency #709
Conversation
I'm so happy to see that this works. In an unrelated PR, do you know if this change means we can remove the CRN_SHARED_DATA and |
I don't know about |
@mattcieslak it looks like you made changes to something in the local niworkflows copy. Do you want me to address the conflict, or would you be willing to (just because you would know better what you changed)? |
it's bizarre, I can't click the "resolve conflicts" button because it says the conflicts are too complex to resolve in a web browser. That's a new one |
I think it's because my branch removes the file completely, while you actually changed the contents in |
Changes proposed in this pull request