fix files after back porting merges from master to atlas/v27r2 (!79) · Merge requests · atlas / Gaudi

Charles Leggett requested to merge leggett/AtlasGaudi:dev/fixMerges into atlas/v27r2 Oct 26, 2016

a few files got messed up in the back-port of a large number of merges from master to atlas/v27r2, due to issues with the ordering of the merges. this MR fixes them.

fix files after back porting merges from master to atlas/v27r2

Merge request reports