resolve merge conflict with 449/467

HealthCatalyst / healthcareai-py

Python tools for healthcare machine learning

http://healthcare.ai

MIT License

313 stars 186 forks source link

Open Aylr opened 6 years ago

Aylr commented 6 years ago

[ ] merge master into 372
[ ] resolve merge conflicts from https://github.com/HealthCatalyst/healthcareai-py/pull/467