7.5-alt11

- fix openssl 1.1 detection, use grep -a for check text in binary

7.5-alt11
5c5ee96e · Etersoft builder · Pavel Vainerman · 53911bbc · 5c5ee96e
Commit 5c5ee96e authored 6 years ago by Etersoft builder Committed by Pavel Vainerman 6 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

nxssh.spec .gear/nxssh.spec +1 -0

No files found.
--- a/.gear/nxssh.spec
+++ b/.gear/nxssh.spec
@@ -59,6 +59,7 @@ install -m755 nxssh %buildroot%_bindir/
 %_bindir/nxssh

 %changelog
+<<<<<<< HEAD
 * Wed Aug 29 2018 Pavel Vainerman <pv@altlinux.ru> 7.5-alt11
 - fix openssl 1.1 detection, use grep -a for check text in binary