cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-09-01 10:44:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test

Browse Source 
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking

# Conflicts:
#	app/Http/Controllers/BookingController.php
#	vendor/composer/autoload_classmap.php
#	vendor/composer/autoload_static.php
This commit is contained in:
Jack Goh
2018-06-13 15:57:08 +08:00
parent 84019bace1 d71fff0b9d
commit 87442520a9
19 changed files with 17900 additions and 9839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Auth/ResetPasswordController.php
-6
View File
@@ -44,12 +44,6 @@ class ResetPasswordController extends Controller
}
protected function showResetForm(){
<<<<<<< HEAD
return view('index');
}
=======
return view('index');
}
>>>>>>> dac3e600db54490eae91cffe68b2a7c72b00df87
}