From 902b6679b16a06552844f6c61f26ddeea8c6e09f Mon Sep 17 00:00:00 2001
From: boufaras <boufaras@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Fri, 4 Feb 2011 16:09:08 +0000
Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2102
 331e1502-861f-0410-8da2-ba01fb791d7f

---
 ParadisEO-GPU/src/cudaType/moCudaVector.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ParadisEO-GPU/src/cudaType/moCudaVector.h b/ParadisEO-GPU/src/cudaType/moCudaVector.h
index 9b21dc1b3..2c133d2ea 100644
--- a/ParadisEO-GPU/src/cudaType/moCudaVector.h
+++ b/ParadisEO-GPU/src/cudaType/moCudaVector.h
@@ -144,6 +144,18 @@ public:
 
 	}
 
+<<<<<<< .mine
+	virtual void printOn(std::ostream& os) const {
+		EO<Fitness>::printOn(os);
+		os << ' ';
+		os << N << ' ';
+		unsigned int i;
+		for( i=0;i<N;i++)
+		  os<< vect[i] << ' ';
+
+	}
+
+=======
 	virtual void printOn(std::ostream& os) const {
 		EO<Fitness>::printOn(os);
 		os << ' ';
@@ -154,6 +166,7 @@ public:
 
 	}
 
+>>>>>>> .r2101
 };
 
 #endif