From: Benjamin Auder Date: Thu, 6 Feb 2020 07:57:07 +0000 (+0100) Subject: 'update' X-Git-Url: https://git.auder.net/variants/current/doc/css/pieces/R.css?a=commitdiff_plain;h=HEAD;p=talweg.git 'update' --- diff --git a/.gitignore b/.gitignore index d0a62df..7b5eb35 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ NAMESPACE #R CMD build/check files /*.Rcheck/ /*.tar.gz -<<<<<<< HEAD #object & library files *.[oa] diff --git a/pkg/R/plot.R b/pkg/R/plot.R index eb77169..0f895bd 100644 --- a/pkg/R/plot.R +++ b/pkg/R/plot.R @@ -20,10 +20,7 @@ plotCurves <- function(data, indices=seq_len(data$getSize())) #' #' @param err Error as returned by \code{computeError()} #' @param cols Colors for each error (default: 1,2,3,...) -<<<<<<< HEAD -======= #' @param agg Aggregation level ("day", "week" or "month") ->>>>>>> 3a38473a435221cc15b6215b0d6677cd370dc2d6 #' #' @seealso \code{\link{plotCurves}}, \code{\link{plotPredReal}}, #' \code{\link{plotSimils}}, \code{\link{plotFbox}}, \code{\link{computeFilaments}},