Merge branch '8.x'

illuminate · Jun 14, 2021 · 5bd65e7 · 5bd65e7
2 parents 22beed0 + 2250ab2
commit 5bd65e7
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/Eloquent/Relations/Relation.php b/Eloquent/Relations/Relation.php
@@ -10,7 +10,6 @@
 use Illuminate\Database\MultipleRecordsFoundException;
 use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Traits\Conditionable;
 use Illuminate\Support\Traits\ForwardsCalls;
 use Illuminate\Support\Traits\Macroable;
 
@@ -19,7 +18,7 @@
  */
 abstract class Relation
 {
-    use Conditionable, ForwardsCalls, Macroable {
+    use ForwardsCalls, Macroable {
         __call as macroCall;
     }