Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bob
bob.measure
Commits
d3d98729
Commit
d3d98729
authored
Apr 05, 2018
by
Theophile GENTILHOMME
Browse files
Fix file after undesired merge
parent
fec8157f
Pipeline
#18418
passed with stage
in 37 minutes and 19 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
bob/measure/script/commands.py
View file @
d3d98729
...
...
@@ -228,22 +228,9 @@ def evaluate(ctx, scores, test, **kwargs):
ctx
.
forward
(
det
)
# use class defaults plot settings
if
test
:
click
.
echo
(
"Computing EPC..."
)
<<<<<<<
HEAD
ctx
.
forward
(
epc
)
# use class defaults plot settings
# the last one closes the file
|||||||
merged
common
ancestors
ctx
.
forward
(
epc
)
<<<<<<<
HEAD
#the last one closes the file
=======
ctx
.
forward
(
epc
)
# the last one closes the file
>>>>>>>
b98021d93c81eee46a730271fad67e001bf084ac
|||||||
merged
common
ancestors
#the last one closes the file
=======
# the last one closes the file
>>>>>>>
b98021d93c81eee46a730271fad67e001bf084ac
ctx
.
meta
[
'closef'
]
=
True
click
.
echo
(
"Computing score histograms..."
)
ctx
.
forward
(
hist
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment