Browse Source

Remove merge markers.

Mark Story 6 years ago
parent
commit
bbbb505da4
1 changed files with 0 additions and 2 deletions
  1. 0 2
      phpstan.neon

+ 0 - 2
phpstan.neon

@@ -5,8 +5,6 @@ parameters:
     level: 5
     autoload_files:
         - tests/bootstrap.php
-<<<<<<< HEAD
-=======
     ignoreErrors:
         - '#Access to undefined constant NumberFormatter::CURRENCY_ACCOUNTING#'
     earlyTerminatingMethodCalls: