Fixining conflicts in UserPhotonFlux from Pythia8.303

Giancarlo Panizzorequested to merge
gpanizzo/athena:21.6 into 21.6

Fixing compatibility 8.303 (Nucleus2gamma2 conflicting with new Nucleus2gamma class in PartonDistributions)

Merge request reports