Merge branch 'develop' into issue-20-fix-CI

This commit is contained in:
Waldir Leoncio 2021-11-10 12:15:09 +01:00
commit 0f004a13ba
3 changed files with 6 additions and 2 deletions

View file

@ -5,4 +5,6 @@ CHANGELOG.md
CITATION.cff
.travis.yml
inst/ext/ExamplesDataFormatting
.github
.github
aux

2
.gitignore vendored
View file

@ -37,3 +37,5 @@ vignettes/*.pdf
# R Environment Variables
.Renviron
aux

View file

@ -36,7 +36,7 @@ Description: Partial R implementation of the BAPS software
License: GPL-3
BugReports: https://github.com/ocbe-uio/rBAPS/issues
Encoding: UTF-8
RoxygenNote: 7.1.1
RoxygenNote: 7.1.2
Suggests:
testthat (>= 2.1.0)
Imports: