Confict in recent merge

MinervaExpt / CCQENu

A port of the CCQENu package from the MINERvA offline software framework to Ben's New Systematics Framework

1 stars 3 forks source link

Closed nhvaughan closed 1 year ago

nhvaughan commented 1 year ago

Some code (e.g. VariableFromConfig.cxx) has conflict markers from a recent merge.

nhvaughan commented 1 year ago

Heidi fixed it