cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove conflict resolution junk. (Nice of cvs to tell me about it

Browse Source 
after it's committed...)
This commit is contained in:
Matthew Hunt 2004-03-10 05:21:44 +00:00
parent cfb7880f0a
commit afcd138d2d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=103491
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MOVED
View File

@ -1,11 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
<<<<<<< MOVED
# $FreeBSD$
=======
# $FreeBSD$
>>>>>>> 1.367
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@ -980,4 +976,3 @@ x11-toolkits/qt32|x11-toolkits/qt33|2004-03-09|qt32 replaced by qt33
mail/ksig|misc/ksig|2004-03-09|ksig is now a part of the kdeaddons ports
mail/exim-old|mail/exim|2004-03-09|No security maintenance from author, successor is exim
sysutils/xwatch||2004-03-09|obsolete-distfile deleted by author