From 1fb5cf10c3e597dbb1ecc4dd423bba727fd7721a Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sun, 13 Apr 2014 15:25:35 +0000
Subject: Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build
 machinery.

---
 src/lib/libcrypto/ec/ecp_mont.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/lib/libcrypto/ec/ecp_mont.c')

diff --git a/src/lib/libcrypto/ec/ecp_mont.c b/src/lib/libcrypto/ec/ecp_mont.c
index 079e47431b..f04f132c7a 100644
--- a/src/lib/libcrypto/ec/ecp_mont.c
+++ b/src/lib/libcrypto/ec/ecp_mont.c
@@ -114,7 +114,6 @@ const EC_METHOD *EC_GFp_mont_method(void)
 		ec_GFp_mont_field_decode,
 		ec_GFp_mont_field_set_to_one };
 
-
 	return &ret;
 #endif
 	}
-- 
cgit v1.2.3-55-g6feb