Fix merge conflict text overlooked.

Author: matham

cellfinder/core/main.py

@@ -181,19 +181,16 @@ def main(
         Called with the batch number that has just finished.
     detect_finished_callback : Callable[list], optional
         Called after detection is finished with the list of detected points.
-<<<<<<< HEAD
     classification_max_workers : int
         The max number of sub-processes to use for data loading / processing
         during classification. Defaults to 3.
-=======
     detect_centre_of_intensity : bool
         If False, a candidate cell's center is just the mean of the positions
         of all voxels marked as above background, or bright, in that candidate.
         The voxel intensity is not taken into account. If True, the center is
         calculated similar to the center of mass, but using the intensity. So
         the center gets pulled towards the brighter voxels in the volume.
         Defaults to False.
->>>>>>> f996519 (Add support for using center of intensity to locate cell centers.)
     """
     from cellfinder.core.classify import classify
     from cellfinder.core.detect import detect