Alazar driver (config1)
Compare changes
Conflict: This file was modified in the source branch, but removed in the target branch.
Ask someone with write access to resolve it.
+ 2
− 1
@@ -7,3 +7,4 @@ from .settings import DAQSettings
@@ -7,3 +7,4 @@ from .settings import DAQSettings