tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-18 07:26:40 +02:00
Code Issues Projects Releases Wiki Activity

MNT Fix merge-up error.

Browse Source
This commit is contained in:
Guy Sartorelli 2022-08-31 13:38:18 +12:00
parent 715415d5c8
commit f0a20ed400
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Core/BaseKernel.php
View File

@ -338,7 +338,6 @@ abstract class BaseKernel implements Kernel
} }
/** /**
>>>>>>> 4
* @return bool * @return bool
*/ */
protected function getIncludeTests() protected function getIncludeTests()