From 5abb4cc98ea7dee945b782d2cb7baa7b649c90c4 Mon Sep 17 00:00:00 2001 From: Hane Date: Sat, 29 Jul 2023 02:31:08 +0200 Subject: [PATCH] ya --- src/proto/proto.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/proto/proto.cpp b/src/proto/proto.cpp index 9b25bc4..031e4d8 100644 --- a/src/proto/proto.cpp +++ b/src/proto/proto.cpp @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD //si, bueno, testx //dossPxa @@ -8,6 +9,11 @@ //si, bueno, testx >>>>>>> Stashed changes >>>>>>> 0ff6488 (linus comes into play) +======= +//si, bueno, testx +//dos + +>>>>>>> f35615e (ya) /* * THREADIN THE LINUS: https://linux.die.net/man/2/sched_setaffinity */