Commit 493b34cf authored by Alexandre Boyer's avatar Alexandre Boyer
Browse files

Merge branch 'master' into 'development'

# Conflicts:
#   .gitignore
#   CHANGELOG.md
#   diva_evaluation_cli/__init__.py
#   diva_evaluation_cli/bin/cli.py
#   diva_evaluation_cli/bin/install.sh
#   doc/cli.md
parents 0031d374 4ffb6a4d
Pipeline #124071 passed with stage
in 24 seconds
{
"Chunk1": {
"activities": [
"Loading",
"Closing_Trunk",
"Exiting",
"Entering",
"Closing"
],
"files": [
"VIRAT_S_000000.mp4"
]
},
"Chunk2": {
"activities": [
"Loading",
"Closing_Trunk",
"Exiting",
"Entering",
"Closing"
],
"files": [
"VIRAT_S_000001.mp4"
]
}
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment