plone/Products.Archetypes — comment on commit da37bac47544d661e100f41a4a3a36994cb2d2b0
File:  line 0
By davisagli:

Please clean up the conflict markers in CHANGES.txt. Also, it would be nice to have a test for this.