Commit aa9a8797 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/commands/actev_validate_execution.py
#   diva_evaluation_cli/bin/private_src/entry_points/actev_validate_execution.py
#   requirements.txt
parents 01ee2a68 1231567c
Pipeline #124264 passed with stage
in 28 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
Supports Markdown
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