primitives3d

53e4f98c · untereiner · fdb2571f · 53e4f98c
Commit 53e4f98c authored Dec 09, 2011 by untereiner
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

include/Algo/Modelisation/primitives3d.hpp include/Algo/Modelisation/primitives3d.hpp +1 -5

No files found.
--- a/include/Algo/Modelisation/primitives3d.hpp
+++ b/include/Algo/Modelisation/primitives3d.hpp
@@ -67,13 +67,9 @@ template <typename PFP>
 Dart Primitive3D<PFP>::HexaGrid1Topo(int nx)
 {
 	// first cube
-<<<<<<< HEAD
-	Dart d0 = createOrientedHexa(); //return a dart from the base of the cube
-	m_tableVertDarts.push_back(d0); //push_back darts frome the base of cubes
-=======
 	Dart d0 = createHexa();
 	m_tableVertDarts.push_back(d0);
->>>>>>> 9d09fe01ab3a12525ca57c400eb2777dfbc5b528
+
 	Dart d1 = m_map.template phi<2112>(d0);

 	for (int i=1; i< nx; ++i)