Merge branch 'master' of https://github.com/goodmost/xmrig into goodm…

…ost-master
fieldz84 · Mar 20, 2024 · ef9bf2a · ef9bf2a
2 parents 42f645f + 08c43b7
commit ef9bf2a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/doc/CHANGELOG_OLD.md b/doc/CHANGELOG_OLD.md
@@ -256,7 +256,7 @@
 
 # v2.8.0
 - **[#753](https://github.com/xmrig/xmrig/issues/753) Added new algorithm [CryptoNight variant 2](https://github.com/xmrig/xmrig/issues/753) for Monero fork, thanks [@SChernykh](https://github.com/SChernykh).**
- - Added global and per thread option `"asm"` and and command line equivalent.
+ - Added global and per thread option `"asm"` and command line equivalent.
 - **[#758](https://github.com/xmrig/xmrig/issues/758) Added SSL/TLS support for secure connections to pools.**
  - Added per pool options `"tls"` and `"tls-fingerprint"` and command line equivalents.
 - [#767](https://github.com/xmrig/xmrig/issues/767) Added config autosave feature, same with GPU miners. 

diff --git a/src/3rdparty/epee/README.md b/src/3rdparty/epee/README.md
@@ -1 +1 @@
-epee - is a small library of helpers, wrappers, tools and and so on, used to make my life easier.
+epee - is a small library of helpers, wrappers, tools and so on, used to make my life easier.