X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
Date: Sun, 1 Mar 2015 17:34:40 -0500
Message-Id: <201503012234.t21MYeW8010226@envy.delorie.com>
From: DJ Delorie <dj AT delorie DOT com>
To: geda-user AT delorie DOT com
In-reply-to: <md03tp$fc0$1@ger.gmane.org> (message from Kai-Martin Knaak on
	Sun, 01 Mar 2015 23:30:17 +0100)
Subject: Re: [geda-user] some downtime...
References: <201502282110 DOT t1SLAUpr002983 AT envy DOT delorie DOT com> <mcvme6$j9j$1 AT ger DOT gmane DOT org> <201503011915 DOT t21JFoYS002150 AT envy DOT delorie DOT com> <md03tp$fc0$1 AT ger DOT gmane DOT org>
Reply-To: geda-user AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: geda-user AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk


You need to "cvs update" the changelog, then edit it and look for
conflicts, and fix them.

CVS might also mark conficts in CVS/Entries for that file.