diff options
Diffstat (limited to 'lib/crypto/vsn.mk')
| -rw-r--r-- | lib/crypto/vsn.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk index e3fb89ced2..f4d1c7b4ba 100644 --- a/lib/crypto/vsn.mk +++ b/lib/crypto/vsn.mk @@ -1 +1,5 @@ +<<<<<<< HEAD +CRYPTO_VSN = 3.7.2 +======= CRYPTO_VSN = 3.6.3.1 +>>>>>>> maint-18 |