From ee26f086217016f09154412b171ad62a33a346f6 Mon Sep 17 00:00:00 2001
From: djm <>
Date: Mon, 6 Apr 2009 06:33:20 +0000
Subject: resolve conflicts

---
 src/lib/libcrypto/dh/dh_err.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/lib/libcrypto/dh/dh_err.c')

diff --git a/src/lib/libcrypto/dh/dh_err.c b/src/lib/libcrypto/dh/dh_err.c
index b364362fca..13263c81c1 100644
--- a/src/lib/libcrypto/dh/dh_err.c
+++ b/src/lib/libcrypto/dh/dh_err.c
@@ -90,8 +90,6 @@ static ERR_STRING_DATA DH_str_reasons[]=
 {ERR_REASON(DH_R_KEY_SIZE_TOO_SMALL)     ,"key size too small"},
 {ERR_REASON(DH_R_MODULUS_TOO_LARGE)      ,"modulus too large"},
 {ERR_REASON(DH_R_NO_PRIVATE_VALUE)       ,"no private value"},
-{ERR_REASON(DH_R_INVALID_PUBKEY)         ,"invalid public key"},
-{ERR_REASON(DH_R_MODULUS_TOO_LARGE)      ,"modulus too large"},
 {0,NULL}
 	};
 
-- 
cgit v1.2.3-55-g6feb