From a6aa0b53e819ad4de7997db86ac7c107c9e294e1 Mon Sep 17 00:00:00 2001
From: szy <szy@opencascade.com>
Date: Mon, 27 Oct 2014 19:08:03 +0300
Subject: [PATCH] Result of merge.

---
 src/GeomAPI/GeomAPI_Shape.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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
-- 
2.39.2