Log Message: ----------- resolve conflicts. Modified Files: -------------- src/contrib/mksh: syn.c (r1.2 -> r1.3) (http://cvsweb.midnightbsd.org/src/contrib/mksh/syn.c?r1=1.2&r2=1.3)