diff options
| author | thiagoftsm <thiagoftsm@gmail.com> | 2019-08-15 11:34:52 +0000 |
|---|---|---|
| committer | Chris Akritidis <43294513+cakrit@users.noreply.github.com> | 2019-08-15 13:34:52 +0200 |
| commit | b11764f1659842ecfce13cf364c13b58983cc9ea (patch) | |
| tree | d12e727a00ee4505021d6f21df073b5bf68b2d16 /tests | |
| parent | f5006d51e8caf9148d393eb68d53dc9fcd28b7b6 (diff) | |
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
Diffstat (limited to 'tests')
| -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 92e6db0f36..0aa5af247f 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 |