From f35615ef0fccc45ea9011a9688ee1bdbe9d6dd41 Mon Sep 17 00:00:00 2001
From: Hane <inupwd@gmail.com>
Date: Sat, 29 Jul 2023 02:31:08 +0200
Subject: [PATCH] ya

---
 src/proto/proto.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/proto/proto.cpp b/src/proto/proto.cpp
index c5b2e7a..ba9706f 100644
--- a/src/proto/proto.cpp
+++ b/src/proto/proto.cpp
@@ -1,7 +1,6 @@
-<<<<<<< Updated upstream
-=======
 //si, bueno, testx
->>>>>>> Stashed changes
+//dos
+
 /*
  * THREADIN THE LINUS: https://linux.die.net/man/2/sched_setaffinity
  */