Commit 638e8245 authored by Joel Collins's avatar Joel Collins
Browse files

Fixed merge conflict artefact

parent fface999

openflexure_microscope/camera/capture.py

+0 −3
Original line number Diff line number Diff line
@@ -100,9 +100,6 @@ def capture_from_dict(capture_dict): 
    capture._metadata = extract_with_priority('custom', md_exif, md_database)

    capture.tags = extract_with_priority('tags', md_exif, md_database)



    

    capture.initialise_stream()



    return capture