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

---
 docs/UPDATING | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/UPDATING b/docs/UPDATING
index 8fa56ea75..c668500a5 100644
--- a/docs/UPDATING
+++ b/docs/UPDATING
@@ -1,6 +1,14 @@
+<<<<<<< .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