Closed shaunakpp closed 6 years ago
Can you merge these conflicts? They're very minor. Also, once you're done resolving the conflicts I'll merge your branch into the SciRuby:refactor code so I that I can make some more logic changes.
Upstream updated 👍
Note: this PR should not affect the logic of any file; if you think it does, please contact me so that we can resolve it.