mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-12 06:17:28 -08:00
Fixed bonked merge conflict
This commit is contained in:
parent
34246ee4ef
commit
a874cc32a8
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue