refs #7789 Conflicts with develop · mantidproject/mantid@a16adeb · GitHub

Commit

refs #7789 Conflicts with develop

Browse files

Merge branch 'feature/7789_fitpeak_to_findpeaks_new' into develop

Conflicts:
	.gitattributes
	Code/Mantid/Framework/Algorithms/src/FindPeaks.cpp

Loading branch information

abuts committed May 2, 2014

2 parents b6a53f9 + 9859c64 commit a16adeb