merge conflict

pimcore · Dec 9, 2024 · f2f7788 · f2f7788
1 parent ff8929b
commit f2f7788
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -18,10 +18,10 @@
   "minimum-stability": "dev",
   "require": {
     "php": "~8.2.0 || ~8.3.0 ",
-    "pimcore/pimcore": "^11.x-dev",
-    "pimcore/static-resolver-bundle": "^2.x-dev",
-    "pimcore/opensearch-client": "^1.x-dev",
-    "pimcore/elasticsearch-client": "^1.x-dev",
+    "pimcore/pimcore": "^11.5",
+    "pimcore/static-resolver-bundle": "^1.4.0 || ^2.0",
+    "pimcore/opensearch-client": "^1.1",
+    "pimcore/elasticsearch-client": "^1.1",
     "doctrine/orm": "^2.17.2",
     "symfony/scheduler": "^6.4",
     "symfony/messenger": "^6.4"