Home Explore Help
Sign In
githab
/
cakephp
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Remove merge markers.

Mark Story 6 years ago
parent
af1e479edc
commit
bbbb505da4
1 changed files with 0 additions and 2 deletions
Split View Show Diff Stats
  1. 0 2
      phpstan.neon

+ 0 - 2
phpstan.neon
View File 

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