From 5d34a280bead7cc7142d3dd3d6e7bfc3c0dc9683 Mon Sep 17 00:00:00 2001 From: Hane Date: Sat, 29 Jul 2023 02:35:29 +0200 Subject: [PATCH] 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) /*