UPDATING update

diff --git a/docs/UPDATING b/docs/UPDATING
index 8fa56ea7544fd76116f763745333213212f5f7cb..c668500a5f453073dfaf0263936169663a0e68aa 100644 (file)
--- 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