diff options
| author | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-03-05 09:29:19 +0100 |
|---|---|---|
| committer | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-03-05 09:29:19 +0100 |
| commit | 365e71f706b40c32173fa06c6feaac48c1527520 (patch) | |
| tree | 54fa72a914d18c9430eaa54f3de4a2d4419198af /testing/do-tests.in | |
| parent | 5d7669b7b3563c50b3c86903e0a49373d597b8a0 (diff) | |
| parent | 568905f488e63e28778f87ac0e38d845f45bae79 (diff) | |
| download | vyos-strongswan-365e71f706b40c32173fa06c6feaac48c1527520.tar.gz vyos-strongswan-365e71f706b40c32173fa06c6feaac48c1527520.zip | |
Fixed merge, don't know why this didn't happen automatically - maybe a leftover from the svn->git conversion
Diffstat (limited to 'testing/do-tests.in')
| -rwxr-xr-x | testing/do-tests.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/testing/do-tests.in b/testing/do-tests.in index 2e67e9367..28a35eabd 100755 --- a/testing/do-tests.in +++ b/testing/do-tests.in @@ -343,6 +343,10 @@ do # $DIR/scripts/load-testconfig $testname +<<<<<<< HEAD +======= + unset RADIUSHOSTS +>>>>>>> upstream/4.5.1 source $TESTDIR/test.conf |