From fe047d8b632246cb2db3234a0a4f32e5c318857b Mon Sep 17 00:00:00 2001
From: djm <>
Date: Fri, 1 Oct 2010 22:59:01 +0000
Subject: resolve conflicts, fix local changes

---
 src/lib/libcrypto/fips_err.c | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 src/lib/libcrypto/fips_err.c

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

diff --git a/src/lib/libcrypto/fips_err.c b/src/lib/libcrypto/fips_err.c
deleted file mode 100644
index 09f11748f6..0000000000
--- a/src/lib/libcrypto/fips_err.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_FIPS
-# include "fips_err.h"
-#else
-static void *dummy=&dummy;
-#endif
-- 
cgit v1.2.3-55-g6feb