From ea530357b27635278ae8a3260e735ea39df5c283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Fri, 3 Feb 2017 12:05:49 +0100
Subject: Fix merge commit

This fixes commit f0867aa2ccbbf5677e0577bba08f8b7bc53ec0ed
---
 lib/crypto/vsn.mk | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'lib/crypto')

diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index f4d1c7b4ba..38e2db9033 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1,5 +1 @@
-<<<<<<< HEAD
 CRYPTO_VSN = 3.7.2
-=======
-CRYPTO_VSN = 3.6.3.1
->>>>>>> maint-18
-- 
cgit v1.2.3