-
https://gitlab.cern.ch/cms_tk_ph2/Ph2_ACFIrene Mateos Dominguez authored
Conflicts: CMakeLists.txt HWInterface/D19cFWInterface.cc HWInterface/D19cFWInterface.h settings/D19CDescription_PS.xml settings/address_tables/uDTC_OT_address_table.xml tools/MultiplexingSetup.cc tools/OpenFinder.cc tools/PSHybridTester.cc tools/PedeNoise.cc tools/PedestalEqualization.cc tools/ShortFinder.cc tools/Tool.cc tools/Tool.h
f57c7047