Fix: formatting with automatic git-clang-format feature

Author: christianreckziegel

PWGJE/Tasks/hfFragmentationFunction.cxx

@@ -19,21 +19,21 @@
 
 #include "PWGHF/Core/DecayChannels.h"
 #include "PWGJE/Core/JetDerivedDataUtilities.h"
-<<<<<<< HEAD
 #include "PWGJE/Core/JetHFUtilities.h"
 #include "PWGJE/Core/JetUtilities.h"
-=======
->>>>>>> 8fcbef4d9 (Fix: clang-formatting done manually)
 #include "PWGJE/Core/JetHFUtilities.h"
 #include "PWGJE/Core/JetUtilities.h"
 #include "PWGJE/DataModel/Jet.h"
 #include "PWGJE/DataModel/JetReducedData.h"
 <<<<<<< HEAD
 =======
 
+<<<<<<< HEAD
 #include "PWGHF/Core/DecayChannels.h"
 >>>>>>> 8fcbef4d9 (Fix: clang-formatting done manually)
 
+=======
+>>>>>>> ee38d6bf6 (Fix: formatting with automatic git-clang-format feature)
 #include "Common/Core/RecoDecay.h"
 
 #include "Framework/ASoA.h"