From 638e8245ad7f671166d2a7368a9c5fb426bf3909 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Fri, 26 Apr 2019 18:34:49 +0100 Subject: [PATCH] Fixed merge conflict artefact --- openflexure_microscope/camera/capture.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/openflexure_microscope/camera/capture.py b/openflexure_microscope/camera/capture.py index 84febb58..02a9dde6 100644 --- a/openflexure_microscope/camera/capture.py +++ b/openflexure_microscope/camera/capture.py @@ -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