From 26d437ec4b557b6df1fd7d9102d586fd666539da Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 28 Feb 2017 19:14:46 +0100 Subject: [PATCH] resolve merge conflict --- src/Mod/Fem/FemInputWriterCcx.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Mod/Fem/FemInputWriterCcx.py b/src/Mod/Fem/FemInputWriterCcx.py index ce431e0edf..7f092e8ac2 100644 --- a/src/Mod/Fem/FemInputWriterCcx.py +++ b/src/Mod/Fem/FemInputWriterCcx.py @@ -1313,8 +1313,6 @@ def get_ccx_elset_solid_name(mat_name, solid_name=None, mat_short_name=None): else: return mat_name + solid_name -<<<<<<< 1a4385e0a55ef98c44bf11d4a4f63366a705416a - def liquid_section_def(obj, section_type): if section_type == 'PIPE MANNING': manning_area = str(obj.ManningArea.getValueAs('mm^2').Value)