Skip to content
Snippets Groups Projects
Commit 666ef87f authored by Arthur Guedon's avatar Arthur Guedon
Browse files

test de nouvelle branche

parent 1e709f3f
No related branches found
No related tags found
1 merge request!68Branchetest
......@@ -3,3 +3,4 @@ export * from './registration.service';
export * from './personnalData.model';
export * from './personnalData.service';
export * from './password.matcher';
// commentaire
\ No newline at end of file
......@@ -33,10 +33,6 @@
</mat-hint>
</mat-form-field>
<<<<<<< HEAD
=======
>>>>>>> donnees_personnelles
<p>
Il ne te reste plus qu'à choisir un mot de passe. :-)
</p>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment