From 8fc07701bcc1f142014a80096d71116f8073fa6e Mon Sep 17 00:00:00 2001
From: Erik van der Kouwe <erik@minix3.org>
Date: Tue, 20 Jul 2010 07:52:55 +0000
Subject: [PATCH] UPDATING update

---
 docs/UPDATING | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/UPDATING b/docs/UPDATING
index c668500a5..08637c920 100644
--- a/docs/UPDATING
+++ b/docs/UPDATING
@@ -1,14 +1,12 @@
-<<<<<<< .mine
 20100719:
 	If you installed using a 3.1.6 image (or earlier) and haven't updated 
 	the boot monitor since r6246 you need to do so now:
 	cd /usr/src/boot; make install; sh updateboot.sh
 
-=======
 20100714:
 	mknod /dev/uds c 18 0
 	chmod 666 /dev/uds
->>>>>>> .r7838
+
 20100713:
         /usr/src/etc/rc updated: copy it (or merge it) to /etc/rc.
         /usr/src/etc/system.conf updated to include boot sys services: copy
-- 
2.44.0