conflict resolved

This commit is contained in:
Olivier PARPAILLON
2024-11-20 12:53:20 +01:00
10 changed files with 185 additions and 14 deletions

2
.idea/php.xml generated
View File

@@ -150,7 +150,7 @@
<path value="$PROJECT_DIR$/vendor/fzaninotto/faker" />
</include_path>
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="8.1" />
<component name="PhpProjectSharedConfiguration" php_language_level="8.2" />
<component name="PhpStanOptionsConfiguration">
<option name="transferred" value="true" />
</component>