fix another issue arrising from merge

phpseclib · Dec 17, 2022 · f28693d · f28693d
1 parent 974a30d
commit f28693d
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -178,7 +178,6 @@
 - SSH/Agent: add support for named pipes on windows (for pageant) (#1866)
 - Crypt/Base: add a function to check continuous buffer status (#1870)
 - OpenSSL 3.0.1+ deprecated some algorithms (RC2, RC4, DES, Blowfish)
->>>>>>> 2.0
 
 ## 2.0.39 - 2022-10-24