fixed

2025-03-03 18:23:49 +03:00
parent 278782a244
commit 683d5249eb
1 changed files with 0 additions and 4 deletions
--- 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());