diff options
| author | Mark Mitchell <mmitchel@gcc.gnu.org> | 1999-03-23 08:38:04 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 1999-03-23 08:38:04 +0000 |
| commit | eb30a375348f31f7c8f74bdd9dedff4390b79014 (patch) | |
| tree | b7793cdd5b7eecafb6e00da85a18a7bb4641e2e6 /gcc | |
| parent | fe9b4957b55b20ec031a6ae0151a9306cb847328 (diff) | |
| download | gcc-eb30a375348f31f7c8f74bdd9dedff4390b79014.zip gcc-eb30a375348f31f7c8f74bdd9dedff4390b79014.tar.gz gcc-eb30a375348f31f7c8f74bdd9dedff4390b79014.tar.bz2 | |
Remove conflict marker.
From-SVN: r25923
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3b9dd25..e189f6d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -65,7 +65,6 @@ * decl.c (start_function): Suppress normal linkage heuristics for #pragma interface under MULTIPLE_SYMBOL_SPACES. ->>>>>>> 1.947 1999-03-19 Alexandre Oliva <oliva@dcc.unicamp.br> * Make-lang.in: ($(INTL_TARGETS)): depend on cp/parse.c |