aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce McKinlay <bryce@gcc.gnu.org>2004-04-16 20:38:52 +0100
committerBryce McKinlay <bryce@gcc.gnu.org>2004-04-16 20:38:52 +0100
commit46fcabbc893d3c18db603436161daf57bde4883b (patch)
tree7cb50a54850767f8f0705f78a1aeee7d8206cb9f
parentbf7ad40253ca16f5998251999ac98e06356cef74 (diff)
downloadgcc-46fcabbc893d3c18db603436161daf57bde4883b.zip
gcc-46fcabbc893d3c18db603436161daf57bde4883b.tar.gz
gcc-46fcabbc893d3c18db603436161daf57bde4883b.tar.bz2
Remove conflict indicators.
From-SVN: r80767
-rw-r--r--libjava/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d425a4b..bdca237 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.