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.

Sign up for GitHub

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

Jump to bottom

Old Merge Conflict is not resolved #310

Open

mmcky opened this issue Jan 3, 2019 · 0 comments

Assignees

Collaborator

mmcky commented Jan 3, 2019

This file has unresolved merge conflicts that need to be resolved.

https://github.com/jstac/Bookshelf/blob/089c5fb51503ad54aad0bdbaf87216c417bf62a5/scripts/dev-config.sh#L64

@tlyon3 do you remember which is the most recent? Or should we trace through the correct ones to keep.

mmcky assigned AakashGfude and tlyon3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment