search

jonesor / compadreDB

Code and data for the COMPADRE Plant Matrix Database and COMADRE Animal Matrix Database
GNU General Public License v2.0
35 stars 20 forks source link

Resolve merge conflict markers in kentropy.R and dentropy.R #17

Closed tdjames1 closed 7 years ago

tdjames1 commented 7 years ago

Resolves https://github.com/jonesor/compadreDB/issues/16

Please review to make sure I've selected the correct function signature and updated the documentation appropriately.