[Midnightbsd-cvs] src: contrib/mksh: Resolve conflicts.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Resolve conflicts.

Modified Files:
--------------
    src/contrib/mksh:
        sh.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/contrib/mksh/sh.h?r1=1.3&r2=1.4)
        syn.c (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/contrib/mksh/syn.c?r1=1.5&r2=1.6)