Skip to content

Commit 94d04c3

Browse files
committed
Please consider the following formatting changes
1 parent aed8226 commit 94d04c3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ALICE3/TableProducer/OTF/onTheFlyRichPid.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<<<<<<< Updated upstream
4545
=======
4646
#include "CommonConstants/MathConstants.h"
47-
>>>>>>> Stashed changes
47+
>>>>>>> Stashed changes
4848
#include "CommonConstants/PhysicsConstants.h"
4949
#include "CommonUtils/NameConf.h"
5050
#include "DataFormatsCalibration/MeanVertexObject.h"
@@ -73,7 +73,7 @@
7373
#include <utility>
7474
#include <vector>
7575

76-
using namespace o2;
76+
using namespace o2;
7777
using namespace o2::framework;
7878
using namespace o2::constants::math;
7979

0 commit comments

Comments
 (0)