fix conflict between master and devel branch#273
Merged
amcadmus merged 2 commits intodeepmodeling:masterfrom Oct 10, 2020
denghuilu:master
Merged
fix conflict between master and devel branch#273amcadmus merged 2 commits intodeepmodeling:masterfrom denghuilu:master
amcadmus merged 2 commits intodeepmodeling:masterfrom
denghuilu:master
Commits
Commits on Oct 9, 2020
- authored
- authored andcommitted
