refs #10476. Fix merge conflict.

Merge branch '10476_improving_smoothDataTest' of github.com:mantidproject/mantid into 10476_improving_smoothDataTest Conflicts: Code/Mantid/Framework/Algorithms/test/SmoothDataTest.h
mantidproject · Jul 20, 2015 · 7a249d5 · 7a249d5
2 parents 8ee010e + 43a926a
commit 7a249d5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Code/Mantid/Framework/Algorithms/test/SmoothDataTest.h b/Code/Mantid/Framework/Algorithms/test/SmoothDataTest.h
@@ -109,6 +109,7 @@ class SmoothDataTest : public CxxTest::TestSuite
 	TS_ASSERT( smooth.isExecuted() );
 
 	MatrixWorkspace_const_sptr output = smooth.getProperty("OutputWorkspace");
+
 	//as alg child is set true, wouldnt need to use AnalysisDataService
 	const Mantid::MantidVec &Y = output->dataY(0);
 	const Mantid::MantidVec &X = output->dataX(0);
@@ -139,7 +140,8 @@ class SmoothDataTest : public CxxTest::TestSuite
   void testExec()
   {
     SmoothData smooth;
-	smooth.initialize();
+    smooth.initialize();
+
 
     TS_ASSERT_THROWS_NOTHING( smooth.setPropertyValue("InputWorkspace","noisy") );
     std::string outputWS("smoothed");