diff options
| author | Jakob Schlyter <jakob@cvs.openbsd.org> | 2005-03-22 16:52:41 +0000 |
|---|---|---|
| committer | Jakob Schlyter <jakob@cvs.openbsd.org> | 2005-03-22 16:52:41 +0000 |
| commit | aa143c5d97c7073734423303e4c620db67d3e778 (patch) | |
| tree | 66071754b6f7957bf77609e5c3dfb2e20a48e36a /usr.sbin/bind/version | |
| parent | 85f94e9dbf9ef0e23e9d1ef58ccb87bcdc40a53b (diff) | |
resolve conflicts
Diffstat (limited to 'usr.sbin/bind/version')
| -rw-r--r-- | usr.sbin/bind/version | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/bind/version b/usr.sbin/bind/version index b074de905d3..e560f62bc71 100644 --- a/usr.sbin/bind/version +++ b/usr.sbin/bind/version @@ -1,10 +1,10 @@ -# $ISC: version,v 1.26.2.17.2.10.4.1 2004/09/20 01:01:01 marka Exp $ +# $ISC: version,v 1.26.2.17.2.17 2005/03/03 04:51:08 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. # MAJORVER=9 MINORVER=3 -PATCHVER=0 +PATCHVER=1 RELEASETYPE= RELEASEVER= |