search

scidash / neuronunit

A package for data-driven validation of neuron and ion channel models using SciUnit
http://neuronunit.scidash.org
38 stars 24 forks source link

Merge error in backend __init__.py #260

Open zsinnema opened 3 years ago

zsinnema commented 3 years ago

@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

rgerkin commented 3 years ago

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

zsinnema commented 3 years ago

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