Conflit2

2023-02-16 15:19:58 +01:00
3 changed files with 5 additions and 2 deletions
--- a/0
+++ b/0
--- a/main.c
+++ b/main.c
@ -3,7 +3,11 @@

 int main() {

-	int var = 6;
+	int var = 5;
 	printf("%d", var);

 }
+
+int f() {
+	printf("Patate");
+}
--- a/1
+++ b/1
@ -1 +0,0 @@
-hello