From cd7ed12292aef11d9062b64f61215174e8cc1860 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 3 Sep 2019 12:23:48 +0200
Subject: Merging upstream version 1.17.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 tests/Makefile.am | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 92e6db0f3..0aa5af247 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,11 +5,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
 CLEANFILES = \
 	health_mgmtapi/health-cmdapi-test.sh \
-<<<<<<< HEAD
 	acls/acl.sh \
-=======
 	urls/request.sh \
->>>>>>> 63a4cadd346df71255d2350128eebcf317e81d0f
 	$(NULL)
 
 include $(top_srcdir)/build/subst.inc
-- 
cgit v1.2.3