Resolved conflicts involving homonymous functions

This commit is contained in:
Waldir Leoncio 2022-02-03 10:43:34 +01:00
parent b872760f81
commit 9ad4fa8c76
26 changed files with 92 additions and 90 deletions

View file

@ -36,7 +36,6 @@ export(takeLine)
export(testaaOnkoKunnollinenBapsData)
export(testaaPop)
export(writeMixtureInfo)
import(utils)
importFrom(Rsamtools,scanBam)
importFrom(adegenet,.readExt)
importFrom(adegenet,read.genepop)
@ -45,6 +44,7 @@ importFrom(ape,read.FASTA)
importFrom(matlab2r,blanks)
importFrom(matlab2r,cell)
importFrom(matlab2r,colon)
importFrom(matlab2r,find)
importFrom(matlab2r,inputdlg)
importFrom(matlab2r,isempty)
importFrom(matlab2r,isfield)