Refactoring and solving merge conflicts

choderalab / modelforge

Infrastructure to implement and train NNPs

https://modelforge.readthedocs.io/en/latest/

MIT License

11 stars 4 forks source link

Refactoring and solving merge conflicts #67

Closed wiederm closed 7 months ago

wiederm commented 7 months ago

Description

Due to the rapid and asynchronous development in this repo PR #64 and #55 have introduced merge conflicts that were difficult to fix. This PR consolidates these in a single PR that updates the main branch.

Todos

[x] Add changes from PR #64
[x] Add changes from PR #55

Status

[x] Ready to go

wiederm commented 7 months ago

I will go ahead and merge these without further review since @chrisiacovella already reviewed PR #55 and PR #64 are only renaming changes.

codecov-commenter commented 7 months ago

Codecov Report

Merging #67 (021f5c8) into main (1c8eee9) will increase coverage by 0.13%. The diff coverage is 91.17%.

Additional details and impacted files