merge conflict solved (0515ea6c) · 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

0515ea6c

Commit 0515ea6c authored 4 years ago by Peter Lünenschloß

Downloads
- Plain Diff

merge conflict solved

parents 64942a31 0b1b1390

No related branches found

No related tags found

3 merge requests!193Release 1.4,!188Release 1.4,!49Dataprocessing features

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

saqc/core/core.py 48 additions, 4 deletions

saqc/core/core.py
saqc/flagger/baseflagger.py 6 additions, 2 deletions

saqc/flagger/baseflagger.py
saqc/funcs/functions.py 137 additions, 7 deletions

saqc/funcs/functions.py
saqc/lib/tools.py 1 addition, 1 deletion

saqc/lib/tools.py
test/funcs/test_functions.py 84 additions, 8 deletions

test/funcs/test_functions.py

with 276 additions and 22 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