From 683d5249eb2f293591c038bd59ac4b2d974c7669 Mon Sep 17 00:00:00 2001 From: ALEXks Date: Mon, 3 Mar 2025 18:23:49 +0300 Subject: [PATCH] fixed --- src/files/Supervisor.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/files/Supervisor.h b/src/files/Supervisor.h index 6503a5a5..3d67cad1 100644 --- a/src/files/Supervisor.h +++ b/src/files/Supervisor.h @@ -257,11 +257,7 @@ public: void saveProgress(long long persentDone) { String dump_progress = "echo '"; -<<<<<<< HEAD dump_progress = dump_progress + to_string(persentDone).c_str() + "' > progress"; -======= - dump_progress = dump_progress + to_string(persentDone).c_str() + "' >> progress"; ->>>>>>> 242719e7a7d26457dbf6d23b3613d00a22d992b4 system(dump_progress.getCharArray());