From 40b12c39c7ab7cac4be07dbd56174e15c43d074b Mon Sep 17 00:00:00 2001 From: Ferran Brosa Planella Date: Wed, 20 May 2020 11:40:42 +0200 Subject: [PATCH] flake8 --- .../electrolyte_conductivity/integrated_conductivity.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pybamm/models/submodels/electrolyte_conductivity/integrated_conductivity.py b/pybamm/models/submodels/electrolyte_conductivity/integrated_conductivity.py index 2c32d4c74f..099c605855 100644 --- 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")