X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=pkg%2FR%2Fplot.R;h=0f895bd16483795302623b53ea983f3ab9c2cd92;hp=eb77169fa635d061f10b783a28e871d158eb8692;hb=HEAD;hpb=81cb8b9e38ae82f2c108f11df56d53c9e29366ed

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}},