diff options
| author | Simon McQueen <simon.mcqueen@gmail.com> | 2006-08-22 10:01:20 +0000 |
|---|---|---|
| committer | Simon McQueen <simon.mcqueen@gmail.com> | 2006-08-22 10:01:20 +0000 |
| commit | e6de4434e4cfdea0ea7ca48bce636c5e312e349e (patch) | |
| tree | e786be058454630f6d6eb3588122d371172f70d4 | |
| parent | 42e11be9004fe86645a248361440e021345848c0 (diff) | |
| download | ATCD-e6de4434e4cfdea0ea7ca48bce636c5e312e349e.tar.gz | |
Removed conflict marker.
| -rw-r--r-- | TAO/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c9c19b9a0dd..91858289c01 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -100,7 +100,6 @@ Mon Aug 21 16:28:51 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> being a redesign on the Stock_Database to make is more generic and easily plugged into other Quoter examples. ->>>>>>> .r74150 Mon Aug 21 10:07:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Portable_Interceptors/Bug_2510_Regression/*: |