Fix a conflict.
authorbriggs <briggs@openbsd.org>
Wed, 12 Mar 1997 22:51:42 +0000 (22:51 +0000)
committerbriggs <briggs@openbsd.org>
Wed, 12 Mar 1997 22:51:42 +0000 (22:51 +0000)
commit10b4923e61ad83bb65db606f6929845955b087dc
tree22fd2ff03d57137f1a6c48d5b8bd6e2cbd8f527d
parent3902649bad1906e33ca6ffd53cd9894c2222fb27
Fix a conflict.
sys/arch/mac68k/dev/z8530tty.c