From: loizides Date: Sun, 26 May 2002 20:50:59 +0000 (+0000) Subject: Solved merge problem of last checkin. X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=6ab8a12a9c93e5782b1c950c7b0dc495d1048b87 Solved merge problem of last checkin. --- diff --git a/HLT/src/AliL3ClustFinderNew.cxx b/HLT/src/AliL3ClustFinderNew.cxx index c60b5ac71f9..f782af271b0 100644 --- a/HLT/src/AliL3ClustFinderNew.cxx +++ b/HLT/src/AliL3ClustFinderNew.cxx @@ -324,7 +324,7 @@ void AliL3ClustFinderNew::WriteClusters(Int_t n_clusters,ClusterData *list) #ifdef do_mc Int_t trackID[3]; GetTrackID((Int_t)rint(fpad),(Int_t)rint(ftime),trackID); - cout<<"padrow "<