aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/vsn.mk
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2017-02-03 12:05:49 +0100
committerBjörn-Egil Dahlberg <[email protected]>2017-02-03 12:05:49 +0100
commitea530357b27635278ae8a3260e735ea39df5c283 (patch)
treebe851c5f9fa4cc4f74f3b2c82895f43542471adb /lib/crypto/vsn.mk
parentb2f2d1059fda823d3f71086a77adeb99d5475b94 (diff)
downloadotp-ea530357b27635278ae8a3260e735ea39df5c283.tar.gz
otp-ea530357b27635278ae8a3260e735ea39df5c283.tar.bz2
otp-ea530357b27635278ae8a3260e735ea39df5c283.zip
Fix merge commit
This fixes commit f0867aa2ccbbf5677e0577bba08f8b7bc53ec0ed
Diffstat (limited to 'lib/crypto/vsn.mk')
-rw-r--r--lib/crypto/vsn.mk4
1 files changed, 0 insertions, 4 deletions
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