[Midnightbsd-cvs] src: i386/loader: resolve conflicts

[laffer1 at midnightbsd.org]

Log Message:
-----------
resolve conflicts

Modified Files:
--------------
    src/sys/boot/i386/loader:
        Makefile (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/loader/Makefile?r1=1.4&r2=1.5)
        main.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/loader/main.c?r1=1.2&r2=1.3)