diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-08-28 13:28:41 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-08-28 13:28:41 +0000 |
| commit | 8af019a2aed855b24edd425a81b3a7b8412846fa (patch) | |
| tree | bf1a58fc5cca40b203958241135a714a5e8c1fc3 | |
| parent | 81128486b4646606e75dc45fb81bec66163c0e77 (diff) | |
| download | ATCD-8af019a2aed855b24edd425a81b3a7b8412846fa.tar.gz | |
Removed bogus conflict characters
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 3c69fb51437..5f481003dcc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,7 +82,6 @@ Wed Aug 27 17:06:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> platform on which these examples don't work. This fixes the link errors in the Cygwin build. ->>>>>>> 4.5512 Wed Aug 27 10:32:03 2003 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/USAGE: |