*** empty log message ***

miscmaths.cc

@@ -13,13 +13,11 @@
 #include <cstdlib>
 #include <cmath>
 #include "miscmaths.h"
-<<<<<<< miscmaths.cc
-=======
 #include "miscprob.h"
 #include "stdlib.h"
->>>>>>> 1.35
 #include "newmatio.h"
 
+
 namespace MISCMATHS {
 
   // The following lines are ignored by the current SGI compiler

volumeseries.h

@@ -98,7 +98,7 @@ namespace MISCMATHS {
       void read(const std::string& fname);
       void writeAsInt(const std::string& fname);
       void writeAsFloat(const std::string& fname);
-      void writeThresholdedSeriesAsFloat(const VolumeInfo& pvolinfo,const ColumnVector& in,const string& fname);
+      void writeThresholdedSeriesAsFloat(const VolumeInfo& pvolinfo,const ColumnVector& in,const std::string& fname);
       
       void replaceMeans();