diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-30 15:25:49 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-30 15:25:49 +0200 |
| commit | 51aa94ea2c2ae57a6c7207aecf39dd4b578ad8f0 (patch) | |
| tree | 4ff9c016097919af6d5647dafa79d8df2f982fb8 | |
| parent | fec2041e037426ac227ee619b59629e059099d05 (diff) | |
| download | rsyslog-51aa94ea2c2ae57a6c7207aecf39dd4b578ad8f0.tar.gz rsyslog-51aa94ea2c2ae57a6c7207aecf39dd4b578ad8f0.tar.xz rsyslog-51aa94ea2c2ae57a6c7207aecf39dd4b578ad8f0.zip | |
fixed left-over from merge failure
thanks to Michael Biebl for pointing the problem out
| -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 \ |