Fix merge error #21582 (a10c6d2b) · 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

a10c6d2b

Commit a10c6d2b authored 7 years ago by Lamar Moore

Downloads
- Patches
- Plain Diff

Fix merge error #21582

parent 16f63d46

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Framework/Geometry/inc/MantidGeometry/Objects/CSGObject.h 0 additions, 2 deletions

Framework/Geometry/inc/MantidGeometry/Objects/CSGObject.h
Framework/Geometry/inc/MantidGeometry/Objects/IObject.h 0 additions, 3 deletions

Framework/Geometry/inc/MantidGeometry/Objects/IObject.h
Framework/Geometry/src/Objects/CSGObject.cpp 0 additions, 4 deletions

Framework/Geometry/src/Objects/CSGObject.cpp

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