fix: fixed merge conflict

2023-11-16 23:21:42 +01:00 · 2023-11-16 23:21:42 +01:00 · d46dafdbe8
commit d46dafdbe8
parent bcc3210761
1 changed files with 0 additions and 3 deletions
--- a/ophyd_devices/epics/devices/psi_detector_base.py
+++ b/ophyd_devices/epics/devices/psi_detector_base.py
@ -14,9 +14,6 @@ from bec_lib.core.bec_service import SERVICE_CONFIG
 from ophyd_devices.epics.devices.bec_scaninfo_mixin import BecScaninfoMixin
 from ophyd_devices.utils import bec_utils

-# Specify here the minimum readout time for the detector
-MIN_READOUT = 3e-3
-

 class DetectorInitError(Exception):
    """Raised when initiation of the device class fails,