diff options
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 3 |
1 files changed, 0 insertions, 3 deletions
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 |