Result of merge.

diff --git a/src/GeomAPI/GeomAPI_Shape.h b/src/GeomAPI/GeomAPI_Shape.h
index 55db3759aec02a5e3cc56653910723489a845365..9c903d68295a10fcba2b842cf8dd6c0dd2749eb4 100644 (file)
--- a/src/GeomAPI/GeomAPI_Shape.h
+++ b/src/GeomAPI/GeomAPI_Shape.h
@@ -32,11 +32,10 @@ class GEOMAPI_EXPORT GeomAPI_Shape : public GeomAPI_Interface
 
 };
 
-<<<<<<< HEAD
+//! Pointer on list of shapes
 typedef std::list<boost::shared_ptr<GeomAPI_Shape>> ListOfShape;
-=======
+
 //! Pointer on attribute object
 typedef boost::shared_ptr<GeomAPI_Shape> GeomShapePtr;
 
->>>>>>> 01cda8378dd1cff425f88438e8c0085122ed7495
 #endif