diff options
| author | Matthew Hunt <mph@FreeBSD.org> | 2004-03-10 05:21:44 +0000 |
|---|---|---|
| committer | Matthew Hunt <mph@FreeBSD.org> | 2004-03-10 05:21:44 +0000 |
| commit | afcd138d2d66b1df3c3edd5ee3625e1d06117386 (patch) | |
| tree | e215f42944bf6741e480708e4ff1b15153a4aa5e /MOVED | |
| parent | Record deletion of sysutils/xwatch. (diff) | |
Remove conflict resolution junk. (Nice of cvs to tell me about it
after it's committed...)
Notes
Notes:
svn path=/head/; revision=103491
Diffstat (limited to 'MOVED')
| -rw-r--r-- | MOVED | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -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 - |