-
Marco Clemencic authored
Conflicts: jenkins/build.sh jenkins/enabled_slots.sh python/LbNightlyTools/EnabledSlots.py python/LbNightlyTools/SlotBuildId.py python/LbNightlyTools/tests/test_enabled_slots_script.py
0615e504
Conflicts: jenkins/build.sh jenkins/enabled_slots.sh python/LbNightlyTools/EnabledSlots.py python/LbNightlyTools/SlotBuildId.py python/LbNightlyTools/tests/test_enabled_slots_script.py