From 7fb72e2425cc637e3f1f3aa9255c00a0dda1dc6c Mon Sep 17 00:00:00 2001 From: Hane Date: Sat, 29 Jul 2023 01:43:21 +0200 Subject: [PATCH 1/5] 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 */ From 5abb4cc98ea7dee945b782d2cb7baa7b649c90c4 Mon Sep 17 00:00:00 2001 From: Hane Date: Sat, 29 Jul 2023 02:31:08 +0200 Subject: [PATCH 2/5] 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 */ From 5d34a280bead7cc7142d3dd3d6e7bfc3c0dc9683 Mon Sep 17 00:00:00 2001 From: Hane Date: Sat, 29 Jul 2023 02:35:29 +0200 Subject: [PATCH 3/5] a --- src/proto/proto.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/proto/proto.cpp b/src/proto/proto.cpp index 031e4d8..7bcc9b6 100644 --- a/src/proto/proto.cpp +++ b/src/proto/proto.cpp @@ -11,7 +11,7 @@ >>>>>>> 0ff6488 (linus comes into play) ======= //si, bueno, testx -//dos +//dosa >>>>>>> f35615e (ya) /* From ae4f271800776c351cc2fb43c21608367c385004 Mon Sep 17 00:00:00 2001 From: Hane Date: Sat, 29 Jul 2023 03:10:40 +0200 Subject: [PATCH 4/5] aaaa --- src/proto/proto.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/proto/proto.cpp b/src/proto/proto.cpp index 7bcc9b6..7aa7ba3 100644 --- a/src/proto/proto.cpp +++ b/src/proto/proto.cpp @@ -11,7 +11,7 @@ >>>>>>> 0ff6488 (linus comes into play) ======= //si, bueno, testx -//dosa +//dossPa >>>>>>> f35615e (ya) /* From a7fa81578f1fb0959412f15ad9b68fb21205ce1e Mon Sep 17 00:00:00 2001 From: Hane Date: Sat, 29 Jul 2023 03:14:45 +0200 Subject: [PATCH 5/5] aae# --- src/proto/proto.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/proto/proto.cpp b/src/proto/proto.cpp index 7aa7ba3..0e21d36 100644 --- a/src/proto/proto.cpp +++ b/src/proto/proto.cpp @@ -11,7 +11,7 @@ >>>>>>> 0ff6488 (linus comes into play) ======= //si, bueno, testx -//dossPa +//dossPxa >>>>>>> f35615e (ya) /*