Fixed merge conflict from develop
Showing
- .gitignore 0 additions, 5 deletions.gitignore
- DESCRIPTION 3 additions, 2 deletionsDESCRIPTION
- NAMESPACE 114 additions, 0 deletionsNAMESPACE
- R/as.data.list.R 3 additions, 4 deletionsR/as.data.list.R
- R/bspline.R 5 additions, 2 deletionsR/bspline.R
- R/cache_name.R 18 additions, 6 deletionsR/cache_name.R
- R/complete_cases.R 101 additions, 0 deletionsR/complete_cases.R
- R/data.list.R 62 additions, 57 deletionsR/data.list.R
- R/depth.R 7 additions, 0 deletionsR/depth.R
- R/flattenlist.R 24 additions, 0 deletionsR/flattenlist.R
- R/forecastmodel.R 81 additions, 18 deletionsR/forecastmodel.R
- R/forecastmodel.R-documentation.R 3 additions, 1 deletionR/forecastmodel.R-documentation.R
- R/in_range.R 21 additions, 6 deletionsR/in_range.R
- R/lagdf.R 4 additions, 4 deletionsR/lagdf.R
- R/lagdl.R 27 additions, 0 deletionsR/lagdl.R
- R/lapply.R 12 additions, 8 deletionsR/lapply.R
- R/lm_fit.R 8 additions, 5 deletionsR/lm_fit.R
- R/lm_optim.R 29 additions, 11 deletionsR/lm_optim.R
- R/make_input.R 1 addition, 1 deletionR/make_input.R
- R/make_periodic.R 46 additions, 0 deletionsR/make_periodic.R
Loading
Please register or sign in to comment