Stephen Ficklin 38d6b34898 Fixed merge conflicts 11 lat temu
..
tripal_pub.AGL.inc 65ec564a10 Updated documentation for pub module 11 lat temu
tripal_pub.PMID.inc 38d6b34898 Fixed merge conflicts 11 lat temu