Hane/tmr
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

a

Browse source
This commit is contained in:
Hane 2023-07-29 02:35:29 +02:00
commit 5d34a280be
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/proto/proto.cpp
View file

@ -11,7 +11,7 @@
>>>>>>> 0ff6488 (linus comes into play) >>>>>>> 0ff6488 (linus comes into play)
======= =======
//si, bueno, testx //si, bueno, testx
//dos //dosa
>>>>>>> f35615e (ya) >>>>>>> f35615e (ya)
/* /*