From 0ff6488545679819e85d94ccf7a1cdf3507d95de 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 play

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

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