From 9b18c2c9662365ca00652aa5df367368c9939818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Thu, 21 Jan 2016 11:26:34 +0100
Subject: [PATCH] FIX: pop-ed stash

---
 app/Http/routes.php | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index 415aa711..8157fa26 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -25,37 +25,12 @@
 Route::group(['middleware' => ['web']], function () {
 
     // display login form
-<<<<<<< HEAD
     Route::get('login', 'Admin\Login@getLoginForm')
          ->name('loginForm');
 
     // ---------------------------------------------------------------
     // @todo move to admin group (protect it)
 
-    // display form for creating new user
-    Route::get('admin/users/new', 'Admin\UserManagement@getNewUser')
-         ->name('users.new');
-
-    // display form for edit of existing user
-    Route::get('admin/users/edit/{id}', 'Admin\UserManagement@getEditExistingUser')
-         ->name('users.edit');
-
-    // display user detail in admin
-    Route::get('admin/users/{id}', 'Admin\UserManagement@getDetail')
-         ->name('users.detail');
-
-    // display list of all users registered into our system
-    Route::get('admin/users/overview/{state?}', 'Admin\UsersManagement@getOverview')
-         ->name('users.overview');
-=======
-    Route::get('login', function () {
-        return view('admin.loginForm.form');
-    });
->>>>>>> user_management
-
-    // ---------------------------------------------------------------
-    // @todo move to admin group (protect it)
-
     // display form for creating new user
     Route::get('admin/users/new', 'Admin\UserManagement@getNewUser')
          ->name('users.new');
@@ -73,22 +48,7 @@ Route::group(['middleware' => ['web']], function () {
          ->name('users.overview');
 
     // POST methods
-<<<<<<< HEAD
     Route::post('login', 'Admin\Login@postLogin')
-=======
-    // ------------------------------------------
-
-    // create new user
-    Route::post('admin/users/new', 'Admin\UserManagement@postRegistration')
-         ->name('admin.users.registration');
-
-    // edit existing user
-    Route::post('admin/users/new', 'Admin\UserManagement@postRegistration')
-         ->name('admin.users.edit');
-
-    // handle login
-    Route::post('admin/login', 'Admin\Login@postLogin')
->>>>>>> user_management
          ->name('login');
 });