merge with remote

[talweg.git] / pkg / R / plot.R

diff --git a/pkg/R/plot.R b/pkg/R/plot.R
index b106e99..eb77169 100644 (file)
--- a/pkg/R/plot.R
+++ b/pkg/R/plot.R
@@ -20,6 +20,10 @@ 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}},