From b7bcf3cb71b52b2896bc97cb2fbe881498ea0061 Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Thu, 14 Apr 2022 11:29:06 +0800
Subject: [PATCH] fix merges'

---
 routes/web.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/routes/web.php b/routes/web.php
index 3f465b5..9218a66 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -683,6 +683,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){
 
     $router->get('customers/{ic}/gadai/{status}',['uses'=>'AdminPageController@showOneCustomerGadai']);
 
+<<<<<<< Updated upstream
     $router->post('permohonan/add/{kodcaw}',['uses'=>'AdminPageController@TambahPermohonan']);
     $router->get('permohonan/get/{kodcaw}',['uses'=>'AdminPageController@GetPermohonanCawangan']);
     $router->get('permohonan/rekod/{kodcaw}',['uses'=>'AdminPageController@GetRekodPermohonanCawangan']);
@@ -699,6 +700,8 @@ $router->group(['prefix'=>'admin'], function () use ($router){
     $router->get('permohonan/viewfiles',['uses'=>'AdminPageController@downloadFile']);
 
     
+=======
+>>>>>>> Stashed changes
 });
 
 $router->group(['prefix'=>'kelantanpay'], function () use ($router){