...
 Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/SimuJenni/3DDPM

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/SimuJenni/3DDPM
...
Merge branch 'master' of https://github.com/SimuJenni/3DDPM
Merge branch 'master' of https://github.com/SimuJenni/3DDPM

Conflicts:
	model/addpartsMod.m
	training/train3D.m
...
Merge branch 'master' of https://github.com/SimuJenni/3DDPM

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/SimuJenni/3DDPM
Merge branch 'master' of https://github.com/SimuJenni/3DDPM
Merge branch 'master' of https://github.com/SimuJenni/3DDPM
Merge branch 'master' of https://github.com/SimuJenni/3DDPM
...
Merge branch 'master' of https://github.com/SimuJenni/3DDPM
Merge branch 'master' of https://github.com/SimuJenni/3DDPM
Merge branch 'master' of https://github.com/SimuJenni/3DDPM
Merge branch 'master' of https://github.com/SimuJenni/3DDPM
Merge branch 'master' of https://github.com/SimuJenni/3DDPM
Merge branch 'master' of https://github.com/SimuJenni/3DDPM

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/SimuJenni/3DDPM