[Midnightbsd-cvs] src: version.h: Fix merge conflicts with the version.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Fix merge conflicts with the version.

Modified Files:
--------------
    src/crypto/openssh:
        version.h (r1.8 -> r1.9)

-------------- next part --------------
Index: version.h
===================================================================
RCS file: /home/cvs/src/crypto/openssh/version.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -L crypto/openssh/version.h -L crypto/openssh/version.h -u -r1.8 -r1.9
--- crypto/openssh/version.h
+++ crypto/openssh/version.h
@@ -1,12 +1,10 @@
-/* $OpenBSD: version.h,v 1.47 2006/08/30 00:14:37 djm Exp $ */
 /* $MidnightBSD$ */
-
-#ifndef SSH_VERSION
+/* $OpenBSD: version.h,v 1.52 2008/03/27 00:16:49 djm Exp $ */
 
 #define SSH_VERSION             (ssh_version_get())
 #define SSH_RELEASE             (ssh_version_get())
-#define SSH_VERSION_BASE        "OpenSSH_4.6p1"
-#define SSH_VERSION_ADDENDUM    "MidnightBSD-20070313"
+#define SSH_VERSION_BASE        "OpenSSH_4.9p1"
+#define SSH_VERSION_ADDENDUM    "MidnightBSD-20080406"
 
 const char *ssh_version_get(void);
 void ssh_version_set_addendum(const char *add);