Commit graph

9 commits

Author SHA1 Message Date
Hamouda Hazar
e0f5be3bc0 Merge branch 'master' of https://git.etud.insa-toulouse.fr/hamoud/tutClubInfo 2023-02-16 15:11:54 +01:00
Toto
9548b25628 Adding some code 2023-02-16 15:11:44 +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
Toto
8e60c04b2a Create a file to do conflict 2023-02-16 15:09:02 +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
34f1a3ca21 Merge branch 'new_branch' of gonet/tutClubInfo into master 2023-02-16 14:53:46 +01:00
Toto
dca68edc8e This is a commit message 2023-02-16 14:48:57 +01:00
Hamouda Hazar
34876d5b3d first commit 2023-02-16 14:32:46 +01:00