Checking on develop/master merge conflicts prior to release 1.3.0

NREL / celavi

Codebase for the Circular Economy Lifecycle Assessment and VIsualization (CELAVI) modeling framework.

https://nrel.github.io/celavi/

GNU General Public License v3.0

9 stars 7 forks source link

Closed rjhanes closed 1 year ago

rjhanes commented 1 year ago

Merge conflict resolved with a commit to develop. Successfully tested commit acfbbad on tiny-data.