From 2283f5e85dbc78dd10810cb6ebfa39e61ab6759e Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Date: Wed, 6 May 2015 09:49:30 -0400
Subject: Unapplying patches to prevent spurious conflicts.

---
 Cryptlib/OpenSSL/crypto/err/err_all.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'Cryptlib/OpenSSL/crypto/err/err_all.c')

diff --git a/Cryptlib/OpenSSL/crypto/err/err_all.c b/Cryptlib/OpenSSL/crypto/err/err_all.c
index 0429389f..39796f7c 100755
--- a/Cryptlib/OpenSSL/crypto/err/err_all.c
+++ b/Cryptlib/OpenSSL/crypto/err/err_all.c
@@ -104,9 +104,7 @@
 #ifndef OPENSSL_NO_JPAKE
 #include <openssl/jpake.h>
 #endif
-#ifndef OPENSSL_NO_COMP
 #include <openssl/comp.h>
-#endif
 
 void ERR_load_crypto_strings(void)
 	{
-- 
cgit v1.2.3