Log Message:
-----------
resolv conflicts
Modified Files:
--------------
src/contrib/mksh:
sh.h (r1.2 -> r1.3)
(http://cvsweb.midnightbsd.org/src/contrib/mksh/sh.h?r1=1.2&r2=1.3)
syn.c (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/contrib/mksh/syn.c?r1=1.4&r2=1.5)