Fixed merge conflict artefact
This commit is contained in:
parent
fface9994e
commit
638e8245ad
1 changed files with 0 additions and 3 deletions
|
|
@ -100,9 +100,6 @@ def capture_from_dict(capture_dict):
|
||||||
capture._metadata = extract_with_priority('custom', md_exif, md_database)
|
capture._metadata = extract_with_priority('custom', md_exif, md_database)
|
||||||
capture.tags = extract_with_priority('tags', md_exif, md_database)
|
capture.tags = extract_with_priority('tags', md_exif, md_database)
|
||||||
|
|
||||||
|
|
||||||
capture.initialise_stream()
|
|
||||||
|
|
||||||
return capture
|
return capture
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue