Fix problems from bad merge-conflict resolution (9d546877) · Commits · mantidproject / mantid · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

mantid
- Activity
- Members
- Labels
- Wiki
- Releases
- Model registry

Snippets Groups Projects

9d546877

Commit 9d546877 authored 9 years ago by Gigg, Martyn Anthony

Downloads
- Patches
- Plain Diff

Fix problems from bad merge-conflict resolution

Refs #11209

parent 368de316

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h 1 addition, 0 deletions

...k/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h
Code/Mantid/Framework/MDAlgorithms/src/FitMD.cpp 1 addition, 1 deletion

Code/Mantid/Framework/MDAlgorithms/src/FitMD.cpp
Code/Mantid/Framework/MDAlgorithms/src/Quantification/ResolutionConvolvedCrossSection.cpp 1 addition, 0 deletions

...ms/src/Quantification/ResolutionConvolvedCrossSection.cpp
Code/Mantid/Framework/MDAlgorithms/test/BinMDTest.h 1 addition, 1 deletion

Code/Mantid/Framework/MDAlgorithms/test/BinMDTest.h

with 4 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment