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) /*