This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

FYI: Resolve old svn merge conflict in classpath/ChangeLog

From: Mark Wielaard <mark at klomp dot org>
To: java-patches at gcc dot gnu dot org
Date: Sat, 04 Feb 2006 18:32:57 +0100
Subject: FYI: Resolve old svn merge conflict in classpath/ChangeLog

Hi,

When merging in the GNU Classpath 0.20 release I introduced a merge
conflict in the ChangeLog file (the file contained local ChangeLog
entries and was rotated upstream). I just fixed this as attached.

Cheers,

Mark

Attachment: ChangeLog-classpath-merge-conflict.patch.gz
Description: GNU Zip compressed data

Attachment: signature.asc
Description: This is a digitally signed message part

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]