From d414893d2f43ae8a2be591db0f6d1dd48103da39 Mon Sep 17 00:00:00 2001
From: coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Thu, 26 Jun 2003 14:46:26 +0000
Subject: Removed bogus conflict marker from ChangeLog

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

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 09cb0f632c8..c906d9a31a4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -124,7 +124,6 @@ Wed Jun 25 12:38:11 2003  Chad Elliott  <elliott_c@ociweb.com>
 
           Updated the file list for this project.
 
->>>>>>> 1.2011
 Wed Jun 25 12:14:39 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * TAO_IDL/tao_idl.mpc:
-- 
cgit v1.2.1