Resolve stupid merge conflicts

BlueBrain · Oct 3, 2024 · 4b680e9 · 4b680e9
1 parent 791cb34
commit 4b680e9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/test/unit/ode/test_ode.py b/test/unit/ode/test_ode.py
@@ -3,12 +3,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-<<<<<<< HEAD
 from nmodl.ode import differentiate2c, integrate2c, make_symbol
-=======
-from nmodl.ode import differentiate2c, integrate2c
 import pytest
->>>>>>> master
 
 import sympy as sp