resolve merge conflict

FreeCAD · Feb 28, 2017 · 6c720ce · 6c720ce
1 parent 6226d2b
commit 6c720ce
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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)