Resolved a conflict. Refs #4266.

mantidproject · Feb 24, 2012 · f3473d2 · f3473d2
1 parent 146a606
commit f3473d2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Code/Mantid/Framework/Algorithms/src/FilterEventsHighFrequency.cpp b/Code/Mantid/Framework/Algorithms/src/FilterEventsHighFrequency.cpp
@@ -889,7 +889,7 @@ namespace Algorithms
 
       if (selected && static_cast<int>(iv) <= numOutputEvents)
       {
-        ofs << iv << "\t" << rawevent.pulseTime().totalNanoseconds() << "\t" << rawevent.tof() << "\t"
+        ofs << iv << "\t" << rawevent.pulseTime().total_nanoseconds() << "\t" << rawevent.tof() << "\t"
             << correctedtof << "\t" << mtime << "\t" << section << std::endl;
       }
     } // ENDFOR iv: each event