aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2017-02-03 12:13:00 +0100
committerBjörn-Egil Dahlberg <[email protected]>2017-02-03 12:13:00 +0100
commit3f471b2eff873e8e5b2dc8a30a5b0693a17317ef (patch)
treef36f9f5561c646272ad7695ceba55a2df80780d0 /lib/crypto
parent4208945259f1a32f4261fc603b2f2be9057c5d50 (diff)
parentea530357b27635278ae8a3260e735ea39df5c283 (diff)
downloadotp-3f471b2eff873e8e5b2dc8a30a5b0693a17317ef.tar.gz
otp-3f471b2eff873e8e5b2dc8a30a5b0693a17317ef.tar.bz2
otp-3f471b2eff873e8e5b2dc8a30a5b0693a17317ef.zip
Merge branch 'maint'
Diffstat (limited to 'lib/crypto')
-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