summaryrefslogtreecommitdiff
path: root/ChangeLogs/ChangeLog-02a
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLogs/ChangeLog-02a')
-rw-r--r--ChangeLogs/ChangeLog-02a5
1 files changed, 0 insertions, 5 deletions
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 0b4f176d09d..690d1a257fc 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -85,11 +85,7 @@ Mon Dec 04 16:32:11 2000 Ossama Othman <ossama@uci.edu>
cases. They are apparently not necessary when performing a SSL
write.
-<<<<<<< ChangeLog
- * ace/SSL/SSL_SOCK_Acceptor.cpp:
-=======
* ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept):
->>>>>>> 4.1304
Check that the X.509 verification didn't fail. If the
verification failed then do not continue.
@@ -212,7 +208,6 @@ Thu Nov 30 22:49:10 2000 pradeep@cs.wustl.edu <pradeep@cs.wustl.edu>
* ACE version 5.1.11 released.
->>>>>>> 4.1299
Wed Nov 29 23:55:37 2000 Pradeep Gore <pradeep@cs.wustl.edu>
* apps/drwho/server.cpp: