fix conflicts

This commit is contained in:
slong753
2023-07-24 16:41:25 -05:00
committed by spencerrlongg
parent 75d7e3e1a0
commit 78c400e948
4 changed files with 34 additions and 14 deletions
@@ -17,7 +17,6 @@ use App\Models\Statuslabel;
use App\Models\User;
use Illuminate\Support\Facades\Auth;
use App\View\Label;
use Auth;
use Carbon\Carbon;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Gate;