diff options
Diffstat (limited to 'xs/xsp/Flow.xsp')
| -rw-r--r-- | xs/xsp/Flow.xsp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xs/xsp/Flow.xsp b/xs/xsp/Flow.xsp index 7c16da831..3056b4001 100644 --- a/xs/xsp/Flow.xsp +++ b/xs/xsp/Flow.xsp @@ -31,11 +31,7 @@ _new_from_width(CLASS, role, width, nozzle_diameter, height) CODE: ConfigOptionFloatOrPercent optwidth; optwidth.deserialize(width, ForwardCompatibilitySubstitutionRule::Disable); -<<<<<<< HEAD - RETVAL = new Flow(Flow::new_from_config_width(role, optwidth, nozzle_diameter, height, bridge_flow_ratio)); -======= RETVAL = new Flow(Flow::new_from_config_width(role, optwidth, nozzle_diameter, height)); ->>>>>>> master OUTPUT: RETVAL |