OSB-54: Fix merge

.gitattributes

.gitignore

.gitlab-ci.yml

CAL/CMakeLists.txt

CAL/CalibrationCommon/CMakeLists.txt

CAL/CalibrationCommon/bin/CMakeLists.txt

CAL/CalibrationCommon/doc/CalibrationCommon.md

CAL/CalibrationCommon/doc/Holography_Data_Set.md

CAL/CalibrationCommon/doc/package.dox

CAL/CalibrationCommon/lib/CMakeLists.txt

CAL/CalibrationCommon/lib/__init__.py

CAL/CalibrationCommon/lib/coordinates.py

CAL/CalibrationCommon/lib/datacontainers/__init__.py

...CalibrationCommon/lib/datacontainers/calibration_table.py

...alibrationCommon/lib/datacontainers/holography_dataset.py

...mmon/lib/datacontainers/holography_dataset_definitions.py

...ionCommon/lib/datacontainers/holography_measurementset.py

...rationCommon/lib/datacontainers/holography_observation.py

...tionCommon/lib/datacontainers/holography_specification.py

CAL/CalibrationCommon/lib/mshologextract.py