ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bonked merge conflict

Browse Source
This commit is contained in:
snipe
2018-12-06 14:20:01 -08:00
parent 34246ee4ef
commit a874cc32a8
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Setting.php
-1
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;