summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoredwardgt <edwardgt@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-09-10 23:33:09 +0000
committeredwardgt <edwardgt@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-09-10 23:33:09 +0000
commit4f77c6380beb00e015a33edcfd7146a11b87bb97 (patch)
treee2211c0f84673f4f9b396ea98d18bf45024fb17e
parentd5cfcd8a504090c46b305ca7e1e74339de8dd240 (diff)
downloadATCD-4f77c6380beb00e015a33edcfd7146a11b87bb97.tar.gz
ChangeLogTag: Wed Sep 10 17:49:10 2003 George Edwards <g.edwards@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0e4f1bdc1fa..8abdafcebbc 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -160,7 +160,6 @@ Sun Sep 7 13:59:20 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
Fixed typo and added #include of OperationDef_i.h.
->>>>>>> 1.2515
Sun Sep 7 09:50:38 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
* orbsvcs/orbsvcs/IFRService/tmplinst.cpp: