Stephen Ficklin 38d6b34898 Fixed merge conflicts %!s(int64=11) %!d(string=hai) anos
..
tripal_cv.DEPRECATED.inc 7e8253ec01 API: changed chado_insert_[table] to [table]_insert %!s(int64=11) %!d(string=hai) anos
tripal_cv.api.inc 38d6b34898 Fixed merge conflicts %!s(int64=11) %!d(string=hai) anos
tripal_cv.schema.api.inc dda046bebb CV: cleaned up doc %!s(int64=11) %!d(string=hai) anos