Removing unfixed conflict

Merged Whitney Armstrong requested to merge whit/hcana:fix into master

src/THcHodoscope.cxx

Merge request reports