Unresolved merge conflicts in kentropy.R and dentropy.R

jonesor / compadreDB

Code and data for the COMPADRE Plant Matrix Database and COMADRE Animal Matrix Database

GNU General Public License v2.0

35 stars 18 forks source link

Unresolved merge conflicts in kentropy.R and dentropy.R #16

Closed tdjames1 closed 7 years ago

tdjames1 commented 7 years ago

There are unresolved merge conflicts where documentation has been added/function signature has been modified for these two files. This causes install_github() to fail.