From df67368134f5706c914e220e9542dcd91760fd8d Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 28 Feb 2017 18:51:53 +0100
Subject: [PATCH] resolve merge conflict

---
 src/Mod/Fem/FemInputWriterCcx.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Mod/Fem/FemInputWriterCcx.py b/src/Mod/Fem/FemInputWriterCcx.py
index 5050d826b0aa..ce431e0edf4a 100644
--- a/src/Mod/Fem/FemInputWriterCcx.py
+++ b/src/Mod/Fem/FemInputWriterCcx.py
@@ -1313,6 +1313,7 @@ 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':
@@ -1370,4 +1371,4 @@ def liquid_section_def(obj, section_type):
         return section_geo
     else:
         return ''
-#  @}
+##  @}