chore: sync with API Platform

2023-09-15 17:49:22 +02:00
parent 81c2a77ed5
commit 253eae0e15
3 changed files with 7 additions and 6 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,6 +11,7 @@
 *.yaml text eol=lf
 *.yml text eol=lf
 bin/console text eol=lf
+composer.lock text eol=lf merge=ours

 *.ico binary
 *.png binary