From 7fb72e2425cc637e3f1f3aa9255c00a0dda1dc6c Mon Sep 17 00:00:00 2001
From: Hane <inupwd@gmail.com>
Date: Sat, 29 Jul 2023 01:43:21 +0200
Subject: [PATCH] linus comes into playc

---
 src/proto/proto.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/proto/proto.cpp b/src/proto/proto.cpp
index a36de82..9b25bc4 100644
--- a/src/proto/proto.cpp
+++ b/src/proto/proto.cpp
@@ -1,6 +1,13 @@
+<<<<<<< HEAD
 //si, bueno, testx
 //dossPxa
 
+=======
+<<<<<<< Updated upstream
+=======
+//si, bueno, testx
+>>>>>>> Stashed changes
+>>>>>>> 0ff6488 (linus comes into play)
 /*
  * THREADIN THE LINUS: https://linux.die.net/man/2/sched_setaffinity
  */