diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-26 14:46:26 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-26 14:46:26 +0000 |
| commit | d414893d2f43ae8a2be591db0f6d1dd48103da39 (patch) | |
| tree | d57bbbcd01685fbf7c4a26e9ff1db429e2376d4d | |
| parent | f1435bef7242495e66f58e17041039fc5f268774 (diff) | |
| download | ATCD-d414893d2f43ae8a2be591db0f6d1dd48103da39.tar.gz | |
Removed bogus conflict marker from ChangeLog
| -rw-r--r-- | TAO/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
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: |