minor fix

adajel · Aug 8, 2024 · d1d4d46 · d1d4d46
1 parent 458de0f
commit d1d4d46
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/knpemidg/solver_emi.py b/src/knpemidg/solver_emi.py
@@ -566,7 +566,6 @@ def solve_for_time_step_picard(self, k, t):
         return
 
 
->>>>>>> add solver_emi file
     def solve_system_passive(self, Tstop, t, solver_params, membrane_params, filename=None):
         """
         Solve system with passive membrane mechanisms