From 068464620b614f24364797a653b9659f1ee8672a Mon Sep 17 00:00:00 2001 From: Philip Manavopoulos Date: Wed, 28 Oct 2020 15:28:02 +0000 Subject: [PATCH] Fix typo in comment (#328) Super minor, I know... --- src/SolutionProviders/MergeConflictSolutionProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SolutionProviders/MergeConflictSolutionProvider.php b/src/SolutionProviders/MergeConflictSolutionProvider.php index bec89e78..d667d433 100644 --- a/src/SolutionProviders/MergeConflictSolutionProvider.php +++ b/src/SolutionProviders/MergeConflictSolutionProvider.php @@ -60,7 +60,7 @@ protected function getCurrentBranch(string $directory): string protected function hasMergeConflictExceptionMessage(Throwable $throwable): bool { - // For PHP 7.x and bellow + // For PHP 7.x and below if (Str::startsWith($throwable->getMessage(), 'syntax error, unexpected \'<<\'')) { return true; }