diff options
author | 2010-10-01 22:58:41 +0000 | |
---|---|---|
committer | 2010-10-01 22:58:41 +0000 | |
commit | 0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe (patch) | |
tree | 9173c770f38c55515569708729da7e02172d3f3d /lib/libssl/src/demos/easy_tls/test.c | |
parent | import OpenSSL-1.0.0a (diff) | |
download | wireguard-openbsd-0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe.tar.xz wireguard-openbsd-0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe.zip |
resolve conflicts, fix local changes
Diffstat (limited to 'lib/libssl/src/demos/easy_tls/test.c')
-rw-r--r-- | lib/libssl/src/demos/easy_tls/test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libssl/src/demos/easy_tls/test.c b/lib/libssl/src/demos/easy_tls/test.c index 9b478c3fd8b..4e40cb91c45 100644 --- a/lib/libssl/src/demos/easy_tls/test.c +++ b/lib/libssl/src/demos/easy_tls/test.c @@ -1,5 +1,5 @@ /* test.c */ -/* $Id: test.c,v 1.3 2002/09/10 16:31:56 markus Exp $ */ +/* $Id: test.c,v 1.4 2010/10/01 22:58:57 djm Exp $ */ #define L_PORT 9999 #define C_PORT 443 |