aboutsummaryrefslogtreecommitdiff
path: root/MOVED
diff options
context:
space:
mode:
authorMatthew Hunt <mph@FreeBSD.org>2004-03-10 05:21:44 +0000
committerMatthew Hunt <mph@FreeBSD.org>2004-03-10 05:21:44 +0000
commitafcd138d2d66b1df3c3edd5ee3625e1d06117386 (patch)
treee215f42944bf6741e480708e4ff1b15153a4aa5e /MOVED
parentcfb7880f0acc835c8a3fb57493277391194e7907 (diff)
downloadports-afcd138d2d66b1df3c3edd5ee3625e1d06117386.tar.gz
ports-afcd138d2d66b1df3c3edd5ee3625e1d06117386.zip
Notes
Diffstat (limited to 'MOVED')
-rw-r--r--MOVED5
1 files changed, 0 insertions, 5 deletions
diff --git a/MOVED b/MOVED
index cde71b6e7bdf..8a848919d946 100644
--- a/MOVED
+++ b/MOVED
@@ -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
-