From: Benjamin Auder <benjamin.auder@somewhere>
Date: Thu, 6 Feb 2020 07:53:29 +0000 (+0100)
Subject: merge with remote
X-Git-Url: https://git.auder.net/game/%7B%7B%20asset%28%27mixstore/css/static/home.css%27%29%20%7D%7D?a=commitdiff_plain;h=81cb8b9e38ae82f2c108f11df56d53c9e29366ed;p=talweg.git

merge with remote
---

81cb8b9e38ae82f2c108f11df56d53c9e29366ed
diff --cc .gitignore
index 7b5eb35,4d19f10..d0a62df
--- a/.gitignore
+++ b/.gitignore
@@@ -14,36 -14,3 +14,37 @@@ NAMESPAC
  #R CMD build/check files
  /*.Rcheck/
  /*.tar.gz
++<<<<<<< HEAD
 +
 +#object & library files
 +*.[oa]
 +*.so
 +
 +#jupyter checkpoints + generated ipynb,html
 +.ipynb_checkpoints/
 +/reports/*.ipynb
 +/reports/*.html
 +
 +#large CSV files
 +data/*.csv
 +
 +#misc
 +*.png
 +#*.tex
 +/AirNormand/
 +
 +#.gitattributes/.gitfat files are generated by initialize.sh
 +.gitattributes
 +.gitfat
 +
 +#Rmarkdown, knitr + LaTeX generated files
 +#*.tex
 +*.pdf
 +!/biblio/*.pdf
 +*.aux
 +*.dvi
 +*.log
 +*.out
 +*.toc
 +*.synctex.gz
 +figure/
diff --cc pkg/R/plot.R
index b106e99,0f895bd..eb77169
--- a/pkg/R/plot.R
+++ b/pkg/R/plot.R
@@@ -20,6 -20,7 +20,10 @@@ plotCurves <- function(data, indices=se
  #'
  #' @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}},