fix: Remove merge conflict

glotzerlab · Nov 13, 2023 · c8cd041 · c8cd041
1 parent cb0cf3f
commit c8cd041
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/projects/flow.2D-random-walk/src/project.py b/projects/flow.2D-random-walk/src/project.py
@@ -147,15 +147,7 @@ def compute_mean_squared_displacement(*jobs):
 
 @RandomWalkProject.pre(all_simulated)
 @RandomWalkProject.post.true("plotted_walks")
-<<<<<<< HEAD
-@RandomWalkProject.operation(
-    aggregator=flow.aggregator.groupby(
-        "standard_deviation", select=lambda job: job.sp.replica <= 4, sort_by="replica"
-    )
-)
-=======
 @RandomWalkProject.operation(aggregator=first_five_replicas)
->>>>>>> main
 def plot_walks(*jobs):
     """Plot the first 5 replicas random walks for each standard_deviation."""
     fig, ax = plt.subplots()