aae#

aaaa
a
2023-08-07 15:05:28 +02:00 · 2023-08-07 15:05:28 +02:00 · 2023-08-07 15:05:27 +02:00 · 2023-08-07 15:05:13 +02:00 · 2023-08-07 15:03:04 +02:00
1 changed files with 13 additions and 0 deletions
--- a/src/proto/proto.cpp
+++ b/src/proto/proto.cpp
@ -1,6 +1,19 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
 //si, bueno, testx
 //dossPxa

+=======
+<<<<<<< Updated upstream
+=======
+//si, bueno, testx
+>>>>>>> Stashed changes
+>>>>>>> 0ff6488 (linus comes into play)
+=======
+//si, bueno, testx
+//dossPxa
+
+>>>>>>> f35615e (ya)
 /*
 * THREADIN THE LINUS: https://linux.die.net/man/2/sched_setaffinity
 */
Author	SHA1	Message	Date
Hane	a7fa81578f	aae#	2023-08-07 15:05:28 +02:00
Hane	ae4f271800	aaaa	2023-08-07 15:05:28 +02:00
Hane	5d34a280be	a	2023-08-07 15:05:27 +02:00
Hane	5abb4cc98e	ya	2023-08-07 15:05:13 +02:00
Hane	7fb72e2425	linus comes into playc	2023-08-07 15:03:04 +02:00