flake8

brosaplanella · Jun 23, 2020 · 40b12c3 · 40b12c3
1 parent 8dc661f
commit 40b12c3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pybamm/models/submodels/electrolyte_conductivity/integrated_conductivity.py b/pybamm/models/submodels/electrolyte_conductivity/integrated_conductivity.py
@@ -43,11 +43,7 @@ def get_coupled_variables(self, variables):
 
         tor_n = variables["Negative electrolyte tortuosity"]
         tor_s = variables["Separator tortuosity"]
-<<<<<<< HEAD
         tor_p = variables["Positive electrolyte tortuosity"]
-=======
-        tor_p = variables["Positive electrolyte tortuosity"]        
->>>>>>> #884 added integrated conductivity model
 
         T_av = variables["X-averaged cell temperature"]
         T_av_n = pybamm.PrimaryBroadcast(T_av, "negative electrode")