Skip to content

Commit 6797d5b

Browse files
NucleiTask - Files renamed
1 parent 413eeb1 commit 6797d5b

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818
<<<<<<< HEAD
1919
=======
2020

21+
<<<<<<< HEAD:PWGLF/Tasks/Nuspex/LFNucleiBATask.cxx
2122
// o2-linter: disable=name/workflow-file
2223
>>>>>>> 5678d3143 (NucleiTask - Fix O2Lint errors)
2324

25+
=======
26+
>>>>>>> a353f854f (NucleiTask - Files renamed):PWGLF/Tasks/Nuspex/lfNucleiBATask.cxx
2427
#include "PWGLF/DataModel/LFNucleiTables.h"
2528
#include "PWGLF/DataModel/LFParticleIdentification.h"
2629
#include "PWGLF/DataModel/mcCentrality.h"

0 commit comments

Comments
 (0)