Merge remote-tracking branch 'origin/main' · tempestphp/highlight@0d8bf6b · GitHub

Commit

Merge remote-tracking branch 'origin/main'

Browse files

# Conflicts:
#	tests/Languages/Twig/Injections/TwigKeywordInjectionTest.php
#	tests/Languages/Twig/Injections/TwigPropertyInjectionTest.php
#	tests/Languages/Twig/Patterns/TwigKeywordPatternTest.php
#	tests/Languages/Twig/Patterns/TwigRegexPatternTest.php

Loading branch information

brendt committed Mar 26, 2024

2 parents 4d4a12f + f605a61 commit 0d8bf6b