solved conflict

README.md

@@ -93,10 +93,17 @@
     - https://api-platform.com/docs/distribution/
     - https://api-platform.com/docs/core/extending/
 
-ddev exec bin/console api:openapi:export --yaml >> openapi.yaml
--> export OpenApi spec
+    ddev exec bin/console api:openapi:export --yaml >> openapi.yaml
+    -> export OpenApi spec
 
 # Lexik JWT
     - https://symfony.com/bundles/LexikJWTAuthenticationBundle/current/index.html
     - Nur bei NEU Installation:
         - php bin/console lexik:jwt:generate-keypair
+    
+    - Open Api export:
+        ddev exec bin/console api:openapi:export --yaml >> openapi.yaml
+    - File Uploading:
+        https://api-platform.com/docs/core/file-upload/
+        https://github.com/dustin10/VichUploaderBundle/blob/master/docs/index.md
+>>>>>>> Stashed changes