From bd158f22798e19555aa3e120ef275c90a23bb748 Mon Sep 17 00:00:00 2001
From: Ali Mohammed <ali.mohammed@hpe.com>
Date: Mon, 18 Oct 2021 11:27:05 +0200
Subject: [PATCH] solve rebase conflict

---
 tests/Makefile.am | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f1146795..4e474f51 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -131,6 +131,11 @@ check_PROGRAMS = check_version check_init check_uuid \
 		 simple_interlock_async_client_2 \
 		 simple_dist_client_1 \
 		 simple_dist_client_2 \
+<<<<<<< HEAD
+=======
+		 simple_dist_client_3 \
+		 simple_dist_client_4 \
+>>>>>>> f51dc7f (solve rebase conflict)
 		 simple_injector \
 		 simple_archiver \
 		 simple_telemetry_listener \
-- 
GitLab