Fix merge conflict

scipp · Jan 30, 2024 · 9cfd078 · 9cfd078
1 parent eed11ca
commit 9cfd078
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/src/esssans/isis/__init__.py b/src/esssans/isis/__init__.py
@@ -42,14 +42,6 @@
     'PixelMask',
     'PixelMaskFilename',
     'providers',
-<<<<<<< HEAD
-||||||| parent of 30d58f1 (Add mechanism for setting sample and detector bank offset in Zoom workflow)
-    'transmission_from_background_run',
-    'transmission_from_sample_run',
-=======
     'SampleOffset',
-    'transmission_from_background_run',
-    'transmission_from_sample_run',
->>>>>>> 30d58f1 (Add mechanism for setting sample and detector bank offset in Zoom workflow)
     'plot_flat_detector_xy',
 ]