#1082 flake8

pybamm-team · Mar 27, 2021 · 97d163a · 97d163a
1 parent a724a84
commit 97d163a
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/pybamm/parameters/lithium_ion_parameters.py b/pybamm/parameters/lithium_ion_parameters.py
@@ -926,11 +926,7 @@ def R_p(self, x):
 
     def c_n_init(self, x):
         """
-        <<<<<<< HEAD
-                Dimensionless initial concentration as a function of dimensionless position x.
-        =======
-                Dimensionless initial concentration as a function of dimensionless position x
-        >>>>>>> develop
+        Dimensionless initial concentration as a function of dimensionless position x.
         """
         return self.c_n_init_dimensional(x) / self.c_n_max