Resolved conflict. Refs #8291.

mantidproject · Dec 2, 2013 · 7968c08 · 7968c08
1 parent 825f24b
commit 7968c08
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CheckWorkspacesMatch.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CheckWorkspacesMatch.h
@@ -109,7 +109,7 @@ class DLLExport CheckWorkspacesMatch : public API::Algorithm
                         double tolTof, double tolWeight, int64_t tolPulse, int compareoption,
                         size_t& numdiffpulse, size_t& numdifftof, size_t& numdiffboth) const;
 
-  std::string m_result; ///< the result string
+  std::string result; ///< the result string
 
   API::Progress * prog;
 };