suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
wmayer 2017-02-28 19:14:46 +01:00
parent 6226d2bc9e
commit 6c720ced84
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Fem/FemInputWriterCcx.py
View File

@ -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)