Skip to content
Snippets Groups Projects
Commit 59cffdd4 authored by Elisabetta Pianori's avatar Elisabetta Pianori
Browse files

Merge branch 'devel' into main_revert_problematic_commit 

Conflicts:
	src/libPS/AgilentE3648APs.cpp
	src/libPS/AgilentE3648APs.h
	src/libPS/python.cpp
parents f68f8237 bfa677bb
No related branches found
No related tags found
2 merge requests!313update NTC coefficients for ITkPix quads,!308Bring main and devel back in sync
Pipeline #6247626 failed
Stage: check
Stage: build
Stage: package
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2014 additions and 222 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment