Skip to content
Snippets Groups Projects
Stefan Bienert's avatar
Bienchen authored
Solved conflicts:

	modules/io/doc/mmcif.rst
	modules/io/pymod/export_mmcif_io.cc
	modules/io/src/mol/mmcif_info.cc
	modules/io/src/mol/mmcif_info.hh
	modules/io/tests/test_mmcif_info.cc
491c71b4
History