Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / GeomAPI / GeomAPI_Shape.h

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