From ec0a8b2e6dab9af4b4fc6c91d2ab7b01e47ea5ce Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Fri, 20 Jun 2014 16:30:34 +0200
Subject: [PATCH] rm conflict

---
 test/vectorization_logic.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/vectorization_logic.cpp b/test/vectorization_logic.cpp
index 1fb079c48..5c6e8042d 100644
--- a/test/vectorization_logic.cpp
+++ b/test/vectorization_logic.cpp
@@ -232,12 +232,8 @@ template<typename Scalar, bool Enable = internal::packet_traits<Scalar>::Vectori
             Matrix<Scalar,EIGEN_PLAIN_ENUM_MAX(2,PacketSize),EIGEN_PLAIN_ENUM_MAX(2,PacketSize)>
             >(DefaultTraversal,CompleteUnrolling)));
 
-<<<<<<< local
-    VERIFY((test_assign(Matrix11(), Matrix11().lazyProduct(Matrix11()), InnerVectorizedTraversal, CompleteUnrolling)));
-=======
     VERIFY((test_assign(Matrix11(), Matrix<Scalar,PacketSize,EIGEN_PLAIN_ENUM_MIN(2,PacketSize)>()*Matrix<Scalar,EIGEN_PLAIN_ENUM_MIN(2,PacketSize),PacketSize>(),
                         PacketSize>=EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD?DefaultTraversal:InnerVectorizedTraversal, CompleteUnrolling)));
->>>>>>> other
     #endif
 
     VERIFY(test_assign(MatrixXX(10,10),MatrixXX(20,20).block(10,10,2,3),