margin-bottom: 20px;

						margin-top: 20px;

pima/routes/web.php

@@ -26,10 +26,5 @@ Route::post('formulaire', ['as' => 'formulaire', 'uses' => 'FormulaireController
 Route::get('formulaire2', [ 'as' => 'formulaire2', 'uses' => 'Formulaire2Controller@create']);
 Route::post('formulaire2', ['as' => 'formulaire2', 'uses' => 'Formulaire2Controller@store']);
 
-<<<<<<< HEAD
-Route::get('profil/{user}', [ 'as' => 'profil', 'uses' => 'ProfilController@create']);
-Route::post('profil/{user}', ['as' => 'profil', 'uses' => 'ProfilController@store']);
-=======
 Route::get('profil', [ 'as' => 'profil', 'uses' => 'ProfilController@create']);
 //Route::post('profil', ['as' => 'profil', 'uses' => 'ProfilController@store']);
->>>>>>> 3109c8babeba5d8c9200c938e5bb4a07447e1e9e