mirror of
https://github.com/opnsense/src.git
synced 2026-04-28 17:49:22 -04:00
Merge to eliminate conflict
This commit is contained in:
parent
c4948ba6a1
commit
7726a8a928
1 changed files with 1 additions and 1 deletions
|
|
@ -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 a new issue