ports/124361: Garbage in ports/UPDATING

[Gary Palmer]

>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 at FreeBSD.org
 
 
 The ">>>>>>> 1.638" is in CVS (as viewable through cvsweb.freebsd.org)
 
 Looks like a merge edit wasn't properly done.