From 51aa94ea2c2ae57a6c7207aecf39dd4b578ad8f0 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 30 Jul 2009 15:25:49 +0200 Subject: fixed left-over from merge failure thanks to Michael Biebl for pointing the problem out --- tests/Makefile.am | 1 - 1 file changed, 1 deletion(-) 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 \ -- cgit v1.2.3