NSLS-II / lightsource2-recipes

[ARCHIVED] Use https://github.com/conda-forge instead.

https://anaconda.org/lightsource2-tag

BSD 3-Clause "New" or "Revised" License

4 stars 22 forks source link

Closed danielballan closed 5 years ago

mrakitin commented 5 years ago

758 seems to cause the conflict as the same commit appears in both PRs. I think rebasing is needed.

mrakitin commented 5 years ago

I went ahead and force-pushed to @danielballan's PR branch to resolve the conflicts.

danielballan commented 5 years ago

Thank you.