fix some merging artefacts
authorMikolaj Krzewicki <mkrzewic@localhost.localdomain>
Fri, 24 Jan 2014 09:57:05 +0000 (10:57 +0100)
committerMikolaj Krzewicki <mikolaj.krzewicki@cern.ch>
Fri, 31 Jan 2014 09:44:56 +0000 (10:44 +0100)
commit50a4bcf05669da9153faacbc8c0ba4dd84ae4dff
tree2519b9c3fd2364964caefde63b34326552481535
parentc415316b987d5d4b85b6d0b013562b32cc341d43
fix some merging artefacts
PWG/FLOW/Tasks/AliFlowEventCuts.h
PWG/FLOW/Tasks/AliFlowEventCuts.h.orig