resolve conflict

Merge branch 'master' of https://github.com/ampatzia/pasaR # Conflicts: # R/main.R
ampatzia · Aug 21, 2017 · 47be06d · 47be06d
2 parents 469e882 + 3f3067c
commit 47be06d
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/R/main.R b/R/main.R
@@ -1029,8 +1029,6 @@ pm_cluster <- function(fluidity_list,method="ward.D",genome_names){
 #' @usage data(bac_stre)
 #'
 #'
-#' @keywords datasets
-#'
 #' @references Mpatziakas A, Psomopoulos FE, Moysiadis T and Sgardelis S. Computing pangenome statistics in R
 #'  F1000Research 2017, 6(ISCB Comm J):1529 (poster) (doi: 10.7490/f1000research.1114765.1)
 #'