summaryrefslogtreecommitdiff
path: root/UPDATING
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2008-06-06 20:23:07 +0000
committerMartin Wilke <miwi@FreeBSD.org>2008-06-06 20:23:07 +0000
commitfec4a192707076f92b311a90e7d197c983decd16 (patch)
treea302a9ef15c13a97c7b080ef258fa92f40c947a5 /UPDATING
parent- pkg-deinstall was moved to files/ (diff)
- Fix merge mistake
Diffstat (limited to 'UPDATING')
-rw-r--r--UPDATING1
1 files changed, 0 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index 47fa447b4b35..c2c85e9e2752 100644
--- a/UPDATING
+++ b/UPDATING
@@ -54,7 +54,6 @@ upgrades.
ikiwiki-transition hashpassword /path/to/your/wiki/srcdir
->>>>>>> 1.638
20080524:
AFFECTS: users of net-im/jabberd
AUTHOR: mm@FreeBSD.org