solved merge conflict

R/getLoadings.R

@@ -18,21 +18,12 @@ getLoadings<-function(inputDF=read.csv("data/input_file_new_kla_div_20200729-0Ba
 
   df1<-inputDF
 
-<<<<<<< HEAD
-  #comment out these lines after testing
-  # df1<-df1[,c(1:42)]
-  # colnames(df1)<-c(colnames(df1[,c(1:19)]),substr(colnames(df1[,c(20:42)]),1,nchar(colnames(df1[,c(20:42)]))-4))
-  # colnames(df1)
-  # df1$excreted<-c(1e10,1e10,1e10,1e10,1e10)
-  #comment out these lines after testing
-=======
 #comment out these lines after testing
   #df1<-df1[,c(1:42)]
   #colnames(df1)<-c(colnames(df1[,c(1:19)]),substr(colnames(df1[,c(20:42)]),1,nchar(colnames(df1[,c(20:42)]))-4))
   #colnames(df1)
   #df1$excreted<-rep(1e10,5)
 #comment out these lines after testing
->>>>>>> fb831e81352fbaa2ec30fb2aebbf9c32ffb0b9b9
 
   pathogenGroups<-c("Virus","Bacteria","Protozoa","Helminth")
   index<-which(pathogenGroups==pathogenType)