correct merging of [ atomtypes ] when bondtypes are used within.#21

zetadin wants to merge 2 commits intodevelopdeGrootLab/pmx:developfrom

itp_merging_atomtypesdeGrootLab/pmx:itp_merging_atomtypesCopy head branch name to clipboard