From a744ec13ade7d70128cd82393862d02c1f712f6a Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Thu, 28 Oct 2004 16:11:31 +0000
Subject: Resolve conflicts

---
 crypto/openssh/compat.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'crypto/openssh/compat.h')

diff --git a/crypto/openssh/compat.h b/crypto/openssh/compat.h
index efa0f08..5efb5c2 100644
--- a/crypto/openssh/compat.h
+++ b/crypto/openssh/compat.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: compat.h,v 1.37 2003/11/02 11:01:03 markus Exp $	*/
+/*	$OpenBSD: compat.h,v 1.38 2004/07/11 17:48:47 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
@@ -27,7 +27,7 @@
 #ifndef COMPAT_H
 #define COMPAT_H
 
-#define	SSH_PROTO_UNKNOWN 	0x00
+#define	SSH_PROTO_UNKNOWN	0x00
 #define	SSH_PROTO_1		0x01
 #define	SSH_PROTO_1_PREFERRED	0x02
 #define	SSH_PROTO_2		0x04
-- 
cgit v1.1