search

michellab / BioSimSpace

Code and resources for the EPSRC BioSimSpace project.
https://biosimspace.org
GNU General Public License v3.0
77 stars 19 forks source link

Sync the two branches #416

Closed xiki-tempula closed 1 year ago

xiki-tempula commented 1 year ago

Given that there are some formatting changes, it might be good to sync the branch before further conflict happens.

lohedges commented 1 year ago

Many thanks for this. I'll do this as follows:

1) Apply the synchronisation to my edits on the new openbiosim/devel here. 2) Backport the changes to a new feature branch on michellab. 3) Raise a PR of the branch against michellab/devel for you to review. This PR will automatically supersede and close this one.

Cheers.