From 0eda89eb26c63716bfe3da7bf797ba85b87a06fa Mon Sep 17 00:00:00 2001 From: Kawlll Maxso Date: Mon, 25 Mar 2019 16:03:01 +0800 Subject: [PATCH] Forgot and change password --- resources/views/pages/authentication/forgot.blade.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/views/pages/authentication/forgot.blade.php b/resources/views/pages/authentication/forgot.blade.php index 1c71992..3dba811 100644 --- a/resources/views/pages/authentication/forgot.blade.php +++ b/resources/views/pages/authentication/forgot.blade.php @@ -52,4 +52,8 @@ -@endsection \ No newline at end of file +<<<<<<< Updated upstream +@endsection +======= +@endsection +>>>>>>> Stashed changes