removing merge marks

src/ctapipe/calib/camera/calibrator.py

@@ -2,10 +2,6 @@
 Definition of the `CameraCalibrator` class, providing all steps needed to apply
 calibration and image extraction, as well as supporting algorithms.
 """
-<<<<<<< HEAD
-
-=======
->>>>>>> c5f385f0 (I added a basic star fitter)
 from functools import cache
 
 import astropy.units as u
@@ -23,9 +19,9 @@
 from ctapipe.image.invalid_pixels import InvalidPixelHandler
 from ctapipe.image.reducer import DataVolumeReducer
 
-
 __all__ = ["CameraCalibrator"]
 
+
 @cache
 def _get_pixel_index(n_pixels):
     """Cached version of ``np.arange(n_pixels)``"""
@@ -50,6 +46,7 @@ def _get_invalid_pixels(n_channels, n_pixels, pixel_status, selected_gain_channe
 
     return broken_pixels
 
+
 class CameraCalibrator(TelescopeComponent):
     """
     Calibrator to handle the full camera calibration chain, in order to fill