resolve conflict

ukhsa-collaboration · Dec 4, 2024 · 86ecb6f · 86ecb6f
1 parent fff1247
commit 86ecb6f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/pygom/model/base_ode_model.py b/src/pygom/model/base_ode_model.py
@@ -165,10 +165,6 @@ def parameters(self):
         """
         if not hasattr(self, "_parameters"):
             return None
-<<<<<<< HEAD
-
-=======
->>>>>>> 8392bdc583652db66b54b5e7b7ccd4868a6607c4
         return self._parameters
 
     @parameters.setter