diff options
| author | djm <> | 2005-04-29 05:39:33 +0000 |
|---|---|---|
| committer | djm <> | 2005-04-29 05:39:33 +0000 |
| commit | 68edd00d9258df93b1366c71ac124e0cadf7bc08 (patch) | |
| tree | 3ce4ae2a9747bbc11aed1f95f9bbea92c41f8683 /src/lib/libssl/test/testenc.com | |
| parent | f396ed0f5ce0af56bfde2e75e15cf1f52924c779 (diff) | |
| download | openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.gz openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.bz2 openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libssl/test/testenc.com')
| -rw-r--r-- | src/lib/libssl/test/testenc.com | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libssl/test/testenc.com b/src/lib/libssl/test/testenc.com index c24fa388c0..5e6f521f9d 100644 --- a/src/lib/libssl/test/testenc.com +++ b/src/lib/libssl/test/testenc.com | |||
| @@ -4,7 +4,7 @@ $ __arch := VAX | |||
| 4 | $ if f$getsyi("cpu") .ge. 128 then __arch := AXP | 4 | $ if f$getsyi("cpu") .ge. 128 then __arch := AXP |
| 5 | $ exe_dir := sys$disk:[-.'__arch'.exe.apps] | 5 | $ exe_dir := sys$disk:[-.'__arch'.exe.apps] |
| 6 | $ | 6 | $ |
| 7 | $ testsrc := makefile.ssl | 7 | $ testsrc := makefile. |
| 8 | $ test := p.txt | 8 | $ test := p.txt |
| 9 | $ cmd := mcr 'exe_dir'openssl | 9 | $ cmd := mcr 'exe_dir'openssl |
| 10 | $ | 10 | $ |