Compare commits

..

No commits in common. "daf46c38953da4c9305e524bb98886202b404a76" and "454eda0e492a0b8ef2951973c9a3c8556afafa05" have entirely different histories.

4
main.c
View File

@ -1,6 +1,2 @@
<<<<<<< HEAD
Ba test yasmine
=======
gfhdre gfhdre
test 2 modification test 2 modification
>>>>>>> 454eda0e492a0b8ef2951973c9a3c8556afafa05