Merge branch 'master' into NLO_matching
Conflicts:
include/RHEJ/ScaleFunction.hh
include/RHEJ/config.hh
src/EventReweighter.cc
src/ScaleFunction.cc
src/YAMLreader.cc
Merge branch 'master' into NLO_matching 055aa6e78a9aUnpublished Unpublished Commit · Learn MoreNot On Permanent Ref: This commit is not an ancestor of any permanent ref.
Description Merge branch 'master' into NLO_matching Conflicts:
Details
Event Timeline
Merged Changes
|