From e5ae2db48ac38aa56ee238e971206e5db7093a2d Mon Sep 17 00:00:00 2001
From: unknown <guillaume.aichhorn@ensiie.fr>
Date: Thu, 22 Nov 2018 09:23:28 +0100
Subject: [PATCH] margin-bottom: 20px; 					
 margin-top: 20px;

---
 pima/routes/web.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pima/routes/web.php b/pima/routes/web.php
index d2a814a..8e9d796 100644
--- a/pima/routes/web.php
+++ b/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
-- 
GitLab