Commit fecf6b35 authored by Manuel Günther's avatar Manuel Günther
Browse files

Merge branch...

Merge branch '27-far-and-frr-thresholds-are-computed-even-when-there-is-no-data-support' of https://gitlab.idiap.ch/bob/bob.measure into 27-far-and-frr-thresholds-are-computed-even-when-there-is-no-data-support

Conflicts:
	bob/measure/test_error.py
parents 7e6a0704 56f95d3e
Pipeline #14056 failed with stages
in 14 minutes and 45 seconds