From owner-freebsd-ports-bugs@FreeBSD.ORG  Fri Jun  6 20:10:01 2008
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
Delivered-To: freebsd-ports-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A823C106568B
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Fri,  6 Jun 2008 20:10:01 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 9AE798FC3C
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Fri,  6 Jun 2008 20:10:01 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m56KA1l3064361
	for <freebsd-ports-bugs@freefall.freebsd.org>;
	Fri, 6 Jun 2008 20:10:01 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m56KA12J064360;
	Fri, 6 Jun 2008 20:10:01 GMT (envelope-from gnats)
Resent-Date: Fri, 6 Jun 2008 20:10:01 GMT
Resent-Message-Id: <200806062010.m56KA12J064360@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-ports-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	Gary Palmer <gpalmer@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 801D11065688
	for <freebsd-gnats-submit@FreeBSD.org>;
	Fri,  6 Jun 2008 20:03:12 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 6CAF08FC1E
	for <freebsd-gnats-submit@FreeBSD.org>;
	Fri,  6 Jun 2008 20:03:12 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m56K3CZa090692
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 6 Jun 2008 20:03:12 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m56K3CP4090691;
	Fri, 6 Jun 2008 20:03:12 GMT (envelope-from nobody)
Message-Id: <200806062003.m56K3CP4090691@www.freebsd.org>
Date: Fri, 6 Jun 2008 20:03:12 GMT
From: Gary Palmer <gpalmer@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Cc: 
Subject: ports/124361: Garbage in ports/UPDATING
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Jun 2008 20:10:01 -0000


>Number:         124361
>Category:       ports
>Synopsis:       Garbage in ports/UPDATING
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 06 20:10:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Gary Palmer
>Release:        
>Organization:
>Environment:
>Description:
In /usr/ports/UPDATING:

>How-To-Repeat:
grep '>>>>>>' /usr/ports/UPDATING
>Fix:
Remove the garbage line

>Release-Note:
>Audit-Trail:
>Unformatted:
 >>>>>>> 1.638
 20080524:
   AFFECTS: users of net-im/jabberd
   AUTHOR: mm@FreeBSD.org
 
 
 The ">>>>>>> 1.638" is in CVS (as viewable through cvsweb.freebsd.org)
 
 Looks like a merge edit wasn't properly done.