Fix merge conflict (79f11090) · Commits · Charlotte Cavanagh / calypso · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

calypso
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

79f11090

Commit 79f11090 authored 2 years ago by Eric Torrence

Downloads
- Plain Diff

Fix merge conflict

parents 1ea2ffdb 17d03256

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Control/CalypsoExample/Simulation/scripts/faserMDC_simulate.py 0 additions, 1 deletion

...ol/CalypsoExample/Simulation/scripts/faserMDC_simulate.py
DetectorDescription/FaserDetDescr/FaserDetDescr/FaserRegion.h 2 additions, 1 deletion

...ctorDescription/FaserDetDescr/FaserDetDescr/FaserRegion.h
DetectorDescription/FaserDetDescr/src/FaserRegionHelper.cxx 1 addition, 0 deletions

DetectorDescription/FaserDetDescr/src/FaserRegionHelper.cxx
Neutrino/NeutrinoDetDescr/EmulsionGeoModel/src/EmulsionPlates.cxx 23 additions, 8 deletions

.../NeutrinoDetDescr/EmulsionGeoModel/src/EmulsionPlates.cxx
Neutrino/NeutrinoDetDescr/EmulsionGeoModel/src/EmulsionPlates.h 3 additions, 1 deletion

...no/NeutrinoDetDescr/EmulsionGeoModel/src/EmulsionPlates.h
Simulation/ISF/ISF_Core/FaserISF_Services/python/FaserISF_ServicesConfigNew.py 2 additions, 1 deletion

...re/FaserISF_Services/python/FaserISF_ServicesConfigNew.py
Simulation/ISF/ISF_Core/FaserISF_Services/src/FaserGeoIDSvc.cxx 2 additions, 0 deletions

...tion/ISF/ISF_Core/FaserISF_Services/src/FaserGeoIDSvc.cxx
Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event/FaserISF_Geant4Event/FaserISFG4GeoHelper.h 1 addition, 1 deletion

...SF_Geant4Event/FaserISF_Geant4Event/FaserISFG4GeoHelper.h
Simulation/ISF/ISF_Geant4/FaserISF_Geant4Event/src/FaserISFG4GeoHelper.cxx 9 additions, 2 deletions

...F_Geant4/FaserISF_Geant4Event/src/FaserISFG4GeoHelper.cxx

with 43 additions and 15 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment