diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-16 19:38:52 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-16 19:38:52 +0000 |
| commit | bf21de82dc7ea52ca44bf806a0cdad1479585f83 (patch) | |
| tree | 7cb50a54850767f8f0705f78a1aeee7d8206cb9f /libjava/ChangeLog | |
| parent | 5851266d212cbfd46b424c1b2e135a503f2003c2 (diff) | |
| download | ppe42-gcc-bf21de82dc7ea52ca44bf806a0cdad1479585f83.tar.gz ppe42-gcc-bf21de82dc7ea52ca44bf806a0cdad1479585f83.zip | |
Remove conflict indicators.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80767 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/ChangeLog')
| -rw-r--r-- | libjava/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d425a4b268e..bdca2372895 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -264,7 +264,6 @@ * java/applet/Applet.java (getPreferredSize): New method. (getMinimumSize): New method. ->>>>>>> 1.2732 2004-04-15 Bryce McKinlay <mckinlay@redhat.com> * prims.cc (_Jv_AllocObject): Remove `size' argument. |
