Attila's modifications were merged, conflict resolved
Showing
- .devcontainer/Dockerfile 5 additions, 1 deletion.devcontainer/Dockerfile
- .devcontainer/devcontainer.json 10 additions, 1 deletion.devcontainer/devcontainer.json
- AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt 3 additions, 3 deletionsAtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt
- AtlasGeometryCommon/BeamPipeGeoModel/python/BeamPipeGMConfig.py 2 additions, 1 deletion...eometryCommon/BeamPipeGeoModel/python/BeamPipeGMConfig.py
- AtlasGeometryCommon/CavernInfraGeoModel/CMakeLists.txt 2 additions, 2 deletionsAtlasGeometryCommon/CavernInfraGeoModel/CMakeLists.txt
- AtlasGeometryCommon/GeoModelEnvelopes/CMakeLists.txt 2 additions, 2 deletionsAtlasGeometryCommon/GeoModelEnvelopes/CMakeLists.txt
- AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigNew.py 2 additions, 1 deletion...DetectorEnvelopes/python/SubDetectorEnvelopesConfigNew.py
- AtlasTest/ControlTest/CMakeLists.txt 6 additions, 3 deletionsAtlasTest/ControlTest/CMakeLists.txt
- AtlasTest/ControlTest/python/test_cfgItemList.py 1 addition, 1 deletionAtlasTest/ControlTest/python/test_cfgItemList.py
- AtlasTest/ControlTest/python/test_keyStore.py 4 additions, 2 deletionsAtlasTest/ControlTest/python/test_keyStore.py
- AtlasTest/ControlTest/share/test_interactive_athena.py 6 additions, 6 deletionsAtlasTest/ControlTest/share/test_interactive_athena.py
- Calorimeter/CaloBadChannelTool/python/CaloBadChanToolConfig.py 2 additions, 1 deletion...imeter/CaloBadChannelTool/python/CaloBadChanToolConfig.py
- Calorimeter/CaloCellCorrection/python/CaloCellCorrectionConfig.py 5 additions, 4 deletions...ter/CaloCellCorrection/python/CaloCellCorrectionConfig.py
- Calorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt 1 addition, 1 deletionCalorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt
- Calorimeter/CaloRec/CMakeLists.txt 1 addition, 2 deletionsCalorimeter/CaloRec/CMakeLists.txt
- Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py 2 additions, 1 deletionCalorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py
- Calorimeter/CaloRec/python/CaloCellMakerConfig.py 3 additions, 2 deletionsCalorimeter/CaloRec/python/CaloCellMakerConfig.py
- Calorimeter/CaloRec/python/CaloRecoConfig.py 3 additions, 2 deletionsCalorimeter/CaloRec/python/CaloRecoConfig.py
- Calorimeter/CaloRec/python/CaloTopoClusterConfig.py 12 additions, 11 deletionsCalorimeter/CaloRec/python/CaloTopoClusterConfig.py
- Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py 3 additions, 2 deletionsCalorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py
Loading
Please register or sign in to comment