Skip to content

fix conflict between master and devel branch#273

Merged
amcadmus merged 2 commits intodeepmodeling:masterfrom
denghuilu:master
Oct 10, 2020
Merged

fix conflict between master and devel branch#273
amcadmus merged 2 commits intodeepmodeling:masterfrom
denghuilu:master

Conversation

@denghuilu
Copy link
Member

now, merging devel to master should be ok

@amcadmus amcadmus merged commit b97c00b into deepmodeling:master Oct 10, 2020
gzq942560379 pushed a commit to HPC-AI-Team/deepmd-kit that referenced this pull request Sep 1, 2021
fix conflict between master and devel branch
njzjz pushed a commit to njzjz/deepmd-kit that referenced this pull request Sep 21, 2023
restart training if interrupted
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants