Manual annotation

Merge branch 'master' of https://github.com/cihanerkut/unicoRn # Conflicts: # R/annotate_chromatogram.R # man/annotate_chromatogram.Rd
cihanerkut · Jan 22, 2017 · 3f0c9aa · 3f0c9aa
2 parents 400fd0c + 0acc2f0
commit 3f0c9aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/R/annotate_chromatogram.R b/R/annotate_chromatogram.R
@@ -17,10 +17,11 @@
 #' 
 #' @note This function may overwrite some of the annotation from chromatogram
 #' data if \code{sample_names} was already used during import via \code{read_unicorn}.
+#' all other columns are be added accordingly.
 #' 
 #' @param chr_data Chromatogram data imported via \code{read_unicorn}
 #' @param sample_info Sample information data frame.
-#'
+
 #' @family data annotation functions
 #' @seealso \code{\link{read_unicorn}}
 #' @importFrom magrittr "%<>%" "%>%"

diff --git a/man/annotate_chromatogram.Rd b/man/annotate_chromatogram.Rd