Compare commits

..

No commits in common. "conflit2" and "master" have entirely different histories.

2
main.c
View file

@ -9,5 +9,5 @@ int main() {
}
int f() {
printf("Chou fleur");
printf("Patate");
}