Skip to content

Commit

Permalink
fixing merge conflict mistake
Browse files Browse the repository at this point in the history
  • Loading branch information
bknueven committed Nov 30, 2022
1 parent 65c3116 commit c91cc06
Showing 1 changed file with 1 addition and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c91cc06

Please sign in to comment.