From 38ce604e3cc97706b876b0525ddff0121115456d Mon Sep 17 00:00:00 2001
From: djm <>
Date: Sat, 6 Sep 2008 12:17:54 +0000
Subject: resolve conflicts

---
 src/lib/libcrypto/cversion.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/lib/libcrypto/cversion.c')

diff --git a/src/lib/libcrypto/cversion.c b/src/lib/libcrypto/cversion.c
index beeeb14013..ea9f25fd16 100644
--- a/src/lib/libcrypto/cversion.c
+++ b/src/lib/libcrypto/cversion.c
@@ -56,10 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
-#include <string.h>
 #include "cryptlib.h"
-#include <openssl/crypto.h>
 
 #ifndef NO_WINDOWS_BRAINDEATH
 #include "buildinf.h"
-- 
cgit v1.2.3-55-g6feb