summaryrefslogtreecommitdiff
path: root/TAO/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/ChangeLog')
-rw-r--r--TAO/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 01cce2e3782..f85f1cd77df 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -41,7 +41,6 @@ Fri May 9 12:41:33 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/AMH/Sink_Server/client.bor:
Fixed these BCB makefiles
->>>>>>> 1.1738
Fri May 09 10:17:47 2003 Simon McQueen <sm@prismtechnologies.com>
* docs/tutorials/Quoter/AMI/client.dsp: