refs #7548. Fix merge conflicts. (77732094) · 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

77732094

Commit 77732094 authored 11 years ago by Owen Arnold

Downloads
- Plain Diff

refs #7548. Fix merge conflicts.

parents 2b0a4683 bce69ba7

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/Algorithms/CMakeLists.txt 3 additions, 0 deletions

Code/Mantid/Framework/Algorithms/CMakeLists.txt
Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CopyLogs.h 68 additions, 0 deletions

...ntid/Framework/Algorithms/inc/MantidAlgorithms/CopyLogs.h
Code/Mantid/Framework/Algorithms/src/CopyLogs.cpp 172 additions, 0 deletions

Code/Mantid/Framework/Algorithms/src/CopyLogs.cpp
Code/Mantid/Framework/Algorithms/test/CopyLogsTest.h 163 additions, 0 deletions

Code/Mantid/Framework/Algorithms/test/CopyLogsTest.h

with 406 additions and 0 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