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

Merge error in backend init.py #260

Open

zsinnema opened this issue Apr 21, 2021 · 2 comments

zsinnema commented Apr 21, 2021

@rgerkin can you please have a look at the dev tree
e.g. this file https://github.com/scidash/neuronunit/blob/dev/neuronunit/models/backends/__init__.py has merge conflicts inside

Contributor

rgerkin commented Apr 22, 2021

Gosh, this is awful. Do you need the dev branch for anything? My hope was that you could work strictly from the metacell branch.

Author

zsinnema commented Apr 23, 2021

Yes no worries, I use the metacell branch :-)

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