Removing checked in merge conflict.
authorIsaac Dooley <idooley2@illinois.edu>
Fri, 27 Mar 2009 16:44:38 +0000 (16:44 +0000)
committerIsaac Dooley <idooley2@illinois.edu>
Fri, 27 Mar 2009 16:44:38 +0000 (16:44 +0000)
src/libs/ck-libs/ParFUM-Tops/ParFUM_TOPS.h

index 329f002e30cf5db92470fb9861ecb37fdad7e21c..14053dbd20ef59c48aba171bb1eb78f00d065471 100644 (file)
@@ -64,11 +64,7 @@ class TopModel{
 #ifdef CUDA
     TopModelDevice device_model;
 #endif
-<<<<<<< ParFUM_TOPS.h
 
-=======
-    
->>>>>>> 1.37
     TopModel(){
       nodeIDHash = NULL;
       elemIDHash = NULL;