Skip to content
Snippets Groups Projects
Commit bd158f22 authored by Ali Mohammed's avatar Ali Mohammed
Browse files

solve rebase conflict

parent d6176047
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 5 additions and 0 deletions
tests/Makefile.am
+ 5
− 0
View file @ bd158f22
...@@ -131,6 +131,11 @@ check_PROGRAMS = check_version check_init check_uuid \ ...@@ -131,6 +131,11 @@ check_PROGRAMS = check_version check_init check_uuid \
simple_interlock_async_client_2 \ simple_interlock_async_client_2 \
simple_dist_client_1 \ simple_dist_client_1 \
simple_dist_client_2 \ simple_dist_client_2 \
<<<<<<< HEAD
=======
simple_dist_client_3 \
simple_dist_client_4 \
>>>>>>> f51dc7f (solve rebase conflict)
simple_injector \ simple_injector \
simple_archiver \ simple_archiver \
simple_telemetry_listener \ simple_telemetry_listener \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment