From 4d6cfe5175eee24847c8d744b37ca5d6e2af1198 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Sat, 9 Jul 2022 16:18:39 +0200
Subject: [PATCH] Add Conditions any tests

---
 examples/Conditions/src/ConditionAnyExampleObjects.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/Conditions/src/ConditionAnyExampleObjects.cpp b/examples/Conditions/src/ConditionAnyExampleObjects.cpp
index 0e537a3a1..c11656b71 100644
--- a/examples/Conditions/src/ConditionAnyExampleObjects.cpp
+++ b/examples/Conditions/src/ConditionAnyExampleObjects.cpp
@@ -79,6 +79,7 @@ void ConditionAnyUpdate2::resolve(Condition target, ConditionUpdateContext& cont
   vector<int>& c1 = cond1.as<vector<int> >();
   data.insert(data.end(), c1.begin(), c1.end());
 }
+<<<<<<< HEAD
 
 
 /// Interface to client Callback in order to update the condition
-- 
GitLab