Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflicts

This commit is contained in:
Taylor Otwell 2015-12-03 12:26:26 -06:00
parent 8414d45cdc f426638445
commit a690bb7552
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Kernel.php
View File

@ -13,7 +13,7 @@ class Kernel extends ConsoleKernel
* @var array * @var array
*/ */
protected $commands = [ protected $commands = [
\App\Console\Commands\Inspire::class, Commands\Inspire::class,
]; ];
/** /**

2
app/Http/Middleware/RedirectIfAuthenticated.php
View File

@ -17,7 +17,7 @@ class RedirectIfAuthenticated
public function handle($request, Closure $next) public function handle($request, Closure $next)
{ {
if (Auth::check()) { if (Auth::check()) {
return redirect('/home'); return redirect('/');
} }
return $next($request); return $next($request);

3
config/app.php
View File

@ -95,7 +95,7 @@
| |
*/ */
'log' => 'single', 'log' => env('APP_LOG', 'single'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -176,7 +176,6 @@
'Gate' => Illuminate\Support\Facades\Gate::class, 'Gate' => Illuminate\Support\Facades\Gate::class,
'Hash' => Illuminate\Support\Facades\Hash::class, 'Hash' => Illuminate\Support\Facades\Hash::class,
'Input' => Illuminate\Support\Facades\Input::class, 'Input' => Illuminate\Support\Facades\Input::class,
'Inspiring' => Illuminate\Foundation\Inspiring::class,
'Lang' => Illuminate\Support\Facades\Lang::class, 'Lang' => Illuminate\Support\Facades\Lang::class,
'Log' => Illuminate\Support\Facades\Log::class, 'Log' => Illuminate\Support\Facades\Log::class,
'Mail' => Illuminate\Support\Facades\Mail::class, 'Mail' => Illuminate\Support\Facades\Mail::class,

2
package.json
View File

@ -4,7 +4,7 @@
"gulp": "^3.8.8" "gulp": "^3.8.8"
}, },
"dependencies": { "dependencies": {
"laravel-elixir": "^3.0.0", "laravel-elixir": "^4.0.0",
"bootstrap-sass": "^3.0.0" "bootstrap-sass": "^3.0.0"
} }
} }

2
resources/lang/en/passwords.php
View File

@ -4,7 +4,7 @@
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Password Reminder Language Lines | Password Reset Language Lines
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| The following language lines are the default lines which match reasons | The following language lines are the default lines which match reasons

2
resources/lang/en/validation.php
View File

@ -60,7 +60,7 @@
'regex' => 'The :attribute format is invalid.', 'regex' => 'The :attribute format is invalid.',
'required' => 'The :attribute field is required.', 'required' => 'The :attribute field is required.',
'required_if' => 'The :attribute field is required when :other is :value.', 'required_if' => 'The :attribute field is required when :other is :value.',
'required_unless' => 'The :attribute field is required unless :other is in :value.', 'required_unless' => 'The :attribute field is required unless :other is in :values.',
'required_with' => 'The :attribute field is required when :values is present.', 'required_with' => 'The :attribute field is required when :values is present.',
'required_with_all' => 'The :attribute field is required when :values is present.', 'required_with_all' => 'The :attribute field is required when :values is present.',
'required_without' => 'The :attribute field is required when :values is not present.', 'required_without' => 'The :attribute field is required when :values is not present.',