From c91cc06dfdb64979630b88b0a4fcb40f3ac0147b Mon Sep 17 00:00:00 2001 From: Bernard Knueven Date: Wed, 30 Nov 2022 16:59:27 -0700 Subject: [PATCH] fixing merge conflict mistake --- .../electrodialysis/tests/test_electrodialysis_1stack.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/watertap/examples/flowsheets/electrodialysis/tests/test_electrodialysis_1stack.py b/watertap/examples/flowsheets/electrodialysis/tests/test_electrodialysis_1stack.py index b63f72a255..434bc16501 100644 --- a/watertap/examples/flowsheets/electrodialysis/tests/test_electrodialysis_1stack.py +++ b/watertap/examples/flowsheets/electrodialysis/tests/test_electrodialysis_1stack.py @@ -47,10 +47,7 @@ assert_degrees_of_freedom, ) -from watertap.costing.watertap_costing_package import ( - WaterTAPCosting, - make_capital_cost_var, -) +from watertap.costing import WaterTAPCosting from watertap.property_models.multicomp_aq_sol_prop_pack import MCASParameterBlock import watertap.examples.flowsheets.electrodialysis.electrodialysis_1stack as edfs