Merge branch 'master' of...

Merge branch 'master' of https://gitlab.telecomnancy.univ-lorraine.fr/Mohamed-Omar.Chida/tp-git-exo3

Merge branch 'master' of...
Merge branch 'master' of https://gitlab.telecomnancy.univ-lorraine.fr/Mohamed-Omar.Chida/tp-git-exo3
147bd620 · Chida MohamedOmar · 53ebfeee · fc7a81d2 · 147bd620
Commit 147bd620 authored 4 years ago by Chida MohamedOmar
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

README.md README.md +2 -3

No files found.
--- a/README.md
+++ b/README.md
 # tp-git-exo3
-
 Exercice 3 du premier TD
-
-
 Conflit !!!!!!!!!! :D
+Exercice 3 du premier TD de COI
+