Code/Mantid/Framework/SINQ/test/PoldiFitPeaks2DTest.h · a54c968f6400119cb7f9f5e6eb144e80bc802fe2 · mantidproject / mantid

10 years ago

Michael Wedel authored 10 years ago

Conflicts:
	Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks2D.h
	Code/Mantid/Framework/SINQ/src/PoldiFitPeaks2D.cpp

Fixing conflicts.

03f024d2

Michael Wedel authored 10 years ago

Conflicts:
	Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks2D.h
	Code/Mantid/Framework/SINQ/src/PoldiFitPeaks2D.cpp

Fixing conflicts.

Code owners

Assign users and groups as approvers for specific file changes. Learn more.