From a874cc32a8ffa23d22479851391df1758d19d2e1 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 6 Dec 2018 14:20:01 -0800
Subject: [PATCH] Fixed bonked merge conflict

---
 app/Models/Setting.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Models/Setting.php b/app/Models/Setting.php
index 6301da3bee..2012767b1b 100755
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -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;