Skip to content

Commit

Permalink
OpenClassrooms-Student-Center#3 conflit
Browse files Browse the repository at this point in the history
  • Loading branch information
@Annie-Lec
Annie-Lec committed Jul 12, 2022
1 parent 331ebf3 commit 5900aae
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Voici les étapes à suivre pour avoir un environnement de développement et de


```
A définir
Modification qui va engendrer un conflit
```


Expand Down

0 comments on commit 5900aae

Please sign in to comment.