projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bf7ad40)
Remove conflict indicators.
authorBryce McKinlay <bryce@gcc.gnu.org>
Fri, 16 Apr 2004 19:38:52 +0000 (20:38 +0100)
committerBryce McKinlay <bryce@gcc.gnu.org>
Fri, 16 Apr 2004 19:38:52 +0000 (20:38 +0100)
From-SVN: r80767

libjava/ChangeLog patch | blob | history

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d425a4b268e6beefea597bc8e9cd4436e744ea0c..bdca23728951661f3c69e20152c9cdb38722ec55 100644 (file)
--- 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.