diff options
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 02c67d81..3f92ac5d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,3 @@ -<<<<<<< HEAD:tests/Makefile.am TESTRUNS = rt_init rscript check_PROGRAMS = $(TESTRUNS) ourtail udptester TESTS = $(TESTRUNS) cfg.sh parsertest.sh omod-if-array.sh \ |