diff options
| author | Jakob Schlyter <jakob@cvs.openbsd.org> | 2007-12-09 13:39:46 +0000 |
|---|---|---|
| committer | Jakob Schlyter <jakob@cvs.openbsd.org> | 2007-12-09 13:39:46 +0000 |
| commit | 1173d5eff8dc423c129f442023419436ee94db23 (patch) | |
| tree | 57c2bcdc1429b2e80b91a387cd1dc561dab988eb /usr.sbin/bind/version | |
| parent | e4a92ccc5f8c866478b32a346c71150a2cdf5001 (diff) | |
resolve conflicts
Diffstat (limited to 'usr.sbin/bind/version')
| -rw-r--r-- | usr.sbin/bind/version | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/bind/version b/usr.sbin/bind/version index e1f1933f5d3..51c871863dc 100644 --- a/usr.sbin/bind/version +++ b/usr.sbin/bind/version @@ -1,10 +1,10 @@ -# $ISC: version,v 1.26.2.17.2.26.4.1 2007/01/11 05:06:25 marka Exp $ +# $ISC: version,v 1.29.134.18 2007/11/19 15:25:23 each Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. # MAJORVER=9 -MINORVER=3 -PATCHVER=4 +MINORVER=4 +PATCHVER=2 RELEASETYPE= RELEASEVER= |