From f0a20ed4008e7c20f98f37be625117fc3aa93628 Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <guy.sartorelli@silverstripe.com>
Date: Wed, 31 Aug 2022 13:38:18 +1200
Subject: [PATCH] MNT Fix merge-up error.

---
 src/Core/BaseKernel.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Core/BaseKernel.php b/src/Core/BaseKernel.php
index af940679b..958a91615 100644
--- a/src/Core/BaseKernel.php
+++ b/src/Core/BaseKernel.php
@@ -338,7 +338,6 @@ abstract class BaseKernel implements Kernel
     }
 
     /**
->>>>>>> 4
      * @return bool
      */
     protected function getIncludeTests()