creer un conflit

Merge branch 'master' of https://git.etud.insa-toulouse.fr/hamoud/tutClubInfo
2023-02-16 15:14:39 +01:00 · 2023-02-16 15:11:54 +01:00 · 2023-02-16 15:09:31 +01:00 · 2023-02-16 15:00:57 +01:00 · 2023-02-16 14:56:18 +01:00
3 changed files with 2 additions and 1 deletions
--- a/0
+++ b/0
--- a/main.c
+++ b/main.c
@ -3,7 +3,7 @@

 int main() {

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

 }
--- a/1
+++ b/1
@ -0,0 +1 @@
+hello
Author	SHA1	Message	Date
Hamouda Hazar	10a495f783	creer un conflit	2023-02-16 15:14:39 +01:00
Hamouda Hazar	e0f5be3bc0	Merge branch 'master' of https://git.etud.insa-toulouse.fr/hamoud/tutClubInfo	2023-02-16 15:11:54 +01:00
Hamouda Hazar	e026c49f86	Merge branch 'master' of https://git.etud.insa-toulouse.fr/hamoud/tutClubInfo	2023-02-16 15:09:31 +01:00
Hamouda Hazar	8328ce399c	pushing essai1 into the main branch	2023-02-16 15:00:57 +01:00
Hamouda Hazar	84e0d8405b	pulling the master branch	2023-02-16 14:56:18 +01:00