Fix bad merge

jbeilstenedmands · Oct 14, 2024 · 0090bb5 · 0090bb5
1 parent fc1a657
commit 0090bb5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 82 deletions.
diff --git a/src/dials/algorithms/correlation/analysis.py b/src/dials/algorithms/correlation/analysis.py
@@ -48,11 +48,6 @@
 absolute_angle_tolerance = 2
   .type = float(value_min=0)
   .help = "Datasets are only accepted if unit cell angles fall within this absolute tolerance of the median cell angles."
-<<<<<<< HEAD
-
-min_reflections = 10
-  .type = int(value_min=1)
-  .help = "The minimum number of reflections per experiment."
 
 dimensionality_assessment {
   outlier_rejection = True
@@ -71,8 +66,6 @@
     .type = float(value_min=0, value_max=1)
     .help = "Buffer for minimum number of points required for a cluster in OPTICS algorithm: min_points=(number_of_datasets/number_of_dimensions)*buffer"
 }
-=======
->>>>>>> 10544d54f (Remove duplicate from phil scope)
 """,
     process_includes=True,
 )

diff --git a/src/dials/algorithms/scaling/scaleit.py b/src/dials/algorithms/scaling/scaleit.py