aboutsummaryrefslogtreecommitdiffstats
path: root/MOVED
diff options
context:
space:
mode:
authormph <mph@FreeBSD.org>2004-03-10 13:21:44 +0800
committermph <mph@FreeBSD.org>2004-03-10 13:21:44 +0800
commitd996b9a7a5945e632feeda0af95c961c9150def4 (patch)
treeb7d5e77776d7288771ea47485237c1e1cdc0f963 /MOVED
parent517019d8c4ef33af6e313502ed86437be62288d7 (diff)
downloadfreebsd-ports-gnome-d996b9a7a5945e632feeda0af95c961c9150def4.tar.gz
freebsd-ports-gnome-d996b9a7a5945e632feeda0af95c961c9150def4.tar.zst
freebsd-ports-gnome-d996b9a7a5945e632feeda0af95c961c9150def4.zip
Remove conflict resolution junk. (Nice of cvs to tell me about it
after it's committed...)
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
-