diff options
Diffstat (limited to 'lib/crypto')
| -rw-r--r-- | lib/crypto/vsn.mk | 4 |
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 |