command: git pull
Error: Your local changes to the files would be owerwritten by merge:
- list of files..
Solution
mix.autoload({ | |
jquery: ['$', 'window.jQuery',"jQuery","window.$","jquery","window.jquery"] | |
}); | |
/** | |
* Manual: https://www.justin.ly/adding-jquery-bootstrap-plugins-laravel-5-mix/ | |
* Source: https://laracasts.com/discuss/channels/elixir/laravel-mix-required-jquery-plugins-cant-be-found | |
*/ |
command: git pull
Error: Your local changes to the files would be owerwritten by merge:
- list of files..
Solution
or (check what working for you)
Working but it must added to app/Exceptions/Handler.php
not VerifyCsrfToken.php
location /phpmyadmin { | |
root /usr/share/; | |
index index.php; | |
try_files $uri $uri/ =404; | |
location ~ ^/phpmyadmin/(doc|sql|setup)/ { | |
deny all; | |
} | |
location ~ /phpmyadmin/(.+\.php)$ { |
<?php | |
namespace App\Http\Controllers; | |
use Illuminate\Http\Request; | |
class PostsController extends Controller | |
{ | |
/** | |
* Base methods structure |