Merge branch 'develop' into 'master' (37338505) · Commits · oekotox / stressaddition · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

stressaddition
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

37338505

Commit 37338505 authored 5 years ago by Sebastian Henz

Downloads
- Plain Diff

Merge branch 'develop' into 'master'

curves_concentration_max and ec error

Closes #25 and #29

See merge request !21

parents 0b22e53a 6e2fa522

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab/merge_request_templates/merge_into_master.md 4 additions, 5 deletions

.gitlab/merge_request_templates/merge_into_master.md
DESCRIPTION 2 additions, 2 deletions

DESCRIPTION
NEWS.md 5 additions, 0 deletions

NEWS.md
R/ec.R 19 additions, 7 deletions

R/ec.R
R/ecxsys.R 21 additions, 11 deletions

R/ecxsys.R
README.md 4 additions, 4 deletions

README.md
man/ec.Rd 6 additions, 1 deletion

man/ec.Rd
man/ecxsys.Rd 5 additions, 0 deletions

man/ecxsys.Rd
tests/testthat/test-ec.R 14 additions, 0 deletions

tests/testthat/test-ec.R
tests/testthat/test-ecxsys.R 17 additions, 2 deletions

tests/testthat/test-ecxsys.R

with 97 additions and 32 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment