diff options
author | Stuart Henderson <sthen@cvs.openbsd.org> | 2013-11-26 12:53:59 +0000 |
---|---|---|
committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2013-11-26 12:53:59 +0000 |
commit | 2b032a0b5d2a9ce63e42ebe314ff5d91039545e3 (patch) | |
tree | 7a88e34592d2253623e877a7b7704b0a6246210c /usr.sbin/nsd/dns.c | |
parent | b665eb4cb1ea56ccad7fee700f05c85dec76e702 (diff) |
merge conflicts
Diffstat (limited to 'usr.sbin/nsd/dns.c')
-rw-r--r-- | usr.sbin/nsd/dns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/nsd/dns.c b/usr.sbin/nsd/dns.c index 7f33a294fda..fbec4f5a2d6 100644 --- a/usr.sbin/nsd/dns.c +++ b/usr.sbin/nsd/dns.c @@ -1,7 +1,7 @@ /* * dns.c -- DNS definitions. * - * Copyright (c) 2001-2011, NLnet Labs. All rights reserved. + * Copyright (c) 2001-2006, NLnet Labs. All rights reserved. * * See LICENSE for the license. * |