fix_compilation_test: Eliminate git messages (#6660)
When it was the merge of different PRs related to web server, there was a garbage in the Makefile this PR removes this garbage
thiagoftsm committed
Aug 15, 2019 at 11:34 UTC
b11764f1659842ecfce13cf364c13b58983cc9ea
1 file changed
-3
tests/Makefile.am
-3
@@ -5,11 +5,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
5
6
CLEANFILES = \
7
health_mgmtapi/health-cmdapi-test.sh \
8
-<<<<<<< HEAD
8
acls/acl.sh \
10
-=======
9
urls/request.sh \
12
->>>>>>> 63a4cadd346df71255d2350128eebcf317e81d0f
10
$(NULL)
11
12
include $(top_srcdir)/build/subst.inc