Fixing the results of a wrong merge
authorhristov <Peter.Hristov@cern.ch>
Wed, 22 Oct 2014 12:30:20 +0000 (14:30 +0200)
committerhristov <Peter.Hristov@cern.ch>
Wed, 22 Oct 2014 12:30:20 +0000 (14:30 +0200)
commit26b9dbebf659459019fdc4d994c162a507238506
tree145fcff8cfb03b1e33331d051101abb093358ec4
parent1dac6d41a7e1c5a664b7c1d5f2fef65a0a13f8d4
Fixing the results of a wrong merge
EVGEN/AliGenEMCocktail.cxx