merge conflicts solved (d20ab7a1) · Commits · rdm-software / SaQC · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SaQC
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

d20ab7a1

Commit d20ab7a1 authored 4 years ago by Peter Lünenschloß

Downloads
- Plain Diff

merge conflicts solved

parents 4600db57 6cfef32e

No related branches found

No related tags found

Loading

Pipeline #10106 passed with stages

in 9 minutes and 7 seconds

Changes 11
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

saqc/flagger/baseflagger.py 84 additions, 8 deletions

saqc/flagger/baseflagger.py
saqc/flagger/dmpflagger.py 18 additions, 6 deletions

saqc/flagger/dmpflagger.py
saqc/flagger/positionalflagger.py 27 additions, 3 deletions

saqc/flagger/positionalflagger.py
saqc/funcs/breaks_detection.py 2 additions, 4 deletions

saqc/funcs/breaks_detection.py
saqc/funcs/functions.py 20 additions, 21 deletions

saqc/funcs/functions.py
saqc/funcs/modelling.py 7 additions, 10 deletions

saqc/funcs/modelling.py
saqc/funcs/proc_functions.py 2 additions, 6 deletions

saqc/funcs/proc_functions.py
saqc/funcs/soil_moisture_tests.py 1 addition, 3 deletions

saqc/funcs/soil_moisture_tests.py
saqc/lib/tools.py 33 additions, 20 deletions

saqc/lib/tools.py
test/flagger/test_flagger.py 33 additions, 0 deletions

test/flagger/test_flagger.py
test/flagger/test_positionalflagger.py 9 additions, 7 deletions

test/flagger/test_positionalflagger.py

with 236 additions and 88 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