From: szy <szy@opencascade.com>
Date: Mon, 27 Oct 2014 16:08:03 +0000 (+0300)
Subject: Result of merge.
X-Git-Tag: V_0.5~69^2^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a6aa0b53e819ad4de7997db86ac7c107c9e294e1;p=modules%2Fshaper.git

Result of merge.
---

diff --git a/src/GeomAPI/GeomAPI_Shape.h b/src/GeomAPI/GeomAPI_Shape.h
index 55db3759a..9c903d682 100644
--- 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