Fixed merge conflicts

This commit is contained in:
Alejandro Celaya
2021-07-30 18:19:32 +02:00
5 changed files with 37 additions and 6 deletions

View File

@@ -24,6 +24,7 @@
"endroid/qr-code": "^4.0",
"geoip2/geoip2": "^2.9",
"guzzlehttp/guzzle": "^7.0",
"guzzlehttp/psr7": "^1.7",
"happyr/doctrine-specification": "^2.0",
"jaybizzle/crawler-detect": "^1.2",
"laminas/laminas-config": "^3.3",