Skip to content
Snippets Groups Projects
Commit a35a58b9 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

reconcile

parent e091a38c
No related branches found
No related tags found
1 merge request!560Resolve Decorator Pattern in IFormFactor hierarchy
Hide whitespace changes
Inline Side-by-side
Sample/Scattering/DecoratedFF.cpp
+ 0
− 4
View file @ a35a58b9
...@@ -14,11 +14,7 @@ ...@@ -14,11 +14,7 @@
#include "Sample/Scattering/DecoratedFF.h" #include "Sample/Scattering/DecoratedFF.h"
#include "Base/Vector/RotMatrix.h" #include "Base/Vector/RotMatrix.h"
<<<<<<< HEAD
#include "Base/Vector/WavevectorInfo.h" // debug #include "Base/Vector/WavevectorInfo.h" // debug
=======
#include "Base/Vector/WavevectorInfo.h"
>>>>>>> 289d652bf7 (broken)
#include "Sample/Material/Material.h" #include "Sample/Material/Material.h"
#include "Sample/Material/MaterialFactoryFuncs.h" #include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Scattering/Rotations.h" #include "Sample/Scattering/Rotations.h"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment