Skip to content

Conversation

@Barthelemy
Copy link
Collaborator

Conflicts:

Framework/src/ServiceDiscovery.cxx

# Conflicts:
#	Framework/src/ServiceDiscovery.cxx

#include <memory>
#include <functional>
#include <Framework/ServiceRegistryRef.h>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think we need that one, it's something else.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok !

Copy link
Collaborator

@knopers8 knopers8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a great day for QC, thank you

@knopers8 knopers8 merged commit 043f167 into AliceO2Group:master Apr 16, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants