From 98ec8b3b37eb30dccf94a0c058cc52829467089d Mon Sep 17 00:00:00 2001
From: SindhuraParuchuri <61188445+SindhuraParuchuri@users.noreply.github.com>
Date: Wed, 24 Jan 2024 12:58:10 -0700
Subject: [PATCH] Updated initializer.py

---
 epymorph/initializer.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epymorph/initializer.py b/epymorph/initializer.py
index dc9803fd..89b5210e 100644
--- a/epymorph/initializer.py
+++ b/epymorph/initializer.py
@@ -269,12 +269,12 @@ def bottom_locations(ctx: InitContext, attribute: str, num_locations: int, seed_
     selection = np.argpartition(arr, num_locations)[:num_locations]
     return indexed_locations(ctx, selection, seed_size)
 
-<<<<<<< HEAD
-=======
+
+
 def bird_movement_initializer(ctx: SimContext)->NDArray[SimDType]:
     result = ctx.geo['bird_population'].reshape((ctx.nodes, ctx.compartments)) # type: ignore
     return result.astype(SimDType)
->>>>>>> 1605ad4 (Simulation Notebook)
+