Merge to eliminate conflict
This commit is contained in:
parent
c4948ba6a1
commit
7726a8a928
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=21253
@ -36,7 +36,7 @@ static char sccsid[] = "@(#)input.c 8.1 (Berkeley) 6/5/93";
|
||||
#elif defined(__NetBSD__)
|
||||
static char rcsid[] = "$NetBSD$";
|
||||
#endif
|
||||
#ident "$Revision: 1.20 $"
|
||||
#ident "$Revision: 1.1.1.5 $"
|
||||
|
||||
#include "defs.h"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user