Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into joss
Browse files Browse the repository at this point in the history
  • Loading branch information
marjanalbooyeh committed Oct 11, 2023
2 parents 22847a0 + 138de17 commit f92ff36
Show file tree
Hide file tree
Showing 2 changed files with 247 additions and 292 deletions.
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,7 @@ def run(self):
package_data={
"flowermd": [
"modules/*",
"sim/*",
"library/*",
"library/forcefields/*",
"library/monomers/*",
"library/**",
"assets/*",
]
},
Expand Down
534 changes: 246 additions & 288 deletions tutorials/4-flowerMD-welding.ipynb

Large diffs are not rendered by default.

0 comments on commit f92ff36

Please sign in to comment.