From owner-freebsd-current  Sun Apr  2 14:02:46 1995
Return-Path: current-owner
Received: (from majordom@localhost) by freefall.cdrom.com (8.6.10/8.6.6) id OAA11433 for current-outgoing; Sun, 2 Apr 1995 14:02:46 -0700
Received: from ibp.ibp.fr (ibp.ibp.fr [132.227.60.30]) by freefall.cdrom.com (8.6.10/8.6.6) with ESMTP id OAA11424 for <current@freebsd.org>; Sun, 2 Apr 1995 14:02:37 -0700
Received: from masi.ibp.fr (root@masi.ibp.fr [132.227.60.23])
	by ibp.ibp.fr (8.6.12/jtpda-5.0) with ESMTP id XAA23202
	for <current@freebsd.org>; Sun, 2 Apr 1995 23:02:55 +0200
Received: from ares.ibp.fr (ares.ibp.fr [132.227.64.31])
	by masi.ibp.fr (8.6.11/jtpda-5.0) with ESMTP id XAA02276
	for <current@freebsd.org>; Sun, 2 Apr 1995 23:00:57 +0200
From: Remy.Card@masi.ibp.fr (Remy CARD)
Received: by ares.ibp.fr
	(8.6.10/jtpda-5.0) id XAA24074
	for current@freebsd.org; Sun, 2 Apr 1995 23:00:18 +0200
Message-Id: <199504022100.XAA24074@ares.ibp.fr>
Subject: CVS conflict file in the latest sup
To: current@FreeBSD.org
Date: Sun, 2 Apr 1995 23:00:17 +0200 (MET DST)
X-Mailer: ELM [version 2.4 PL21]
Content-Type: text
Content-Length: 457       
Sender: current-owner@FreeBSD.org
Precedence: bulk


	Hi,

	During the latest sup, I got:
SUP Upgrade of lib at Sun Apr  2 22:59:18 1995
SUP Fileserver 8.13 (4.3 BSD) 11291 on freefall.cdrom.com at 22:59:18
SUP Requesting changes since Apr  2 05:22:47 1995
SUP Using compressed file transfer
...
SUP Receiving file lib/libc/rpc/.#clnt_udp.c.1.1
...

	I suppose that .#clnt_udp.c.1.1 has been created by CVS because of
a conflict on the clnt_udp.c source file.  Could someone please fix this?

	Thanks

		Remy