From a4128e366925ca79d6de72bf9e010260819e355f Mon Sep 17 00:00:00 2001
From: wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Tue, 7 Oct 2003 14:47:46 +0000
Subject: ChangeLogTag: Tues Oct  7 08:44:52 2003  Dale Wilson 
 <wilson_d@ociweb.com>

---
 TAO/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 00c27d27389..9e51c761b81 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1775,7 +1775,6 @@ Thu Jul 03 17:03:33 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
           Set correct BUILD_DLL define when building shared libs. This fixes
           link errors in the Cygwin/MinGW and Kylix builds.
 
->>>>>>> 1.2069
 Thu Jul 03 16:24:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp (init_endpoint):
-- 
cgit v1.2.1