Fixed bonked merge conflict

This commit is contained in:
snipe 2018-12-06 14:20:01 -08:00
parent 34246ee4ef
commit a874cc32a8

View file

@ -6,7 +6,6 @@ use Parsedown;
use App\Events\SettingSaved;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Cache;
use Watson\Validating\ValidatingTrait;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Notifications\Notifiable;
use Watson\Validating\ValidatingTrait;