From cec8c3dded1d4f56f8a853c370b1acabf98a1929 Mon Sep 17 00:00:00 2001
From: Divyajose <75604843+divya-intelli@users.noreply.github.com>
Date: Fri, 30 Jun 2023 17:39:30 +0530
Subject: [PATCH] Conflict resolved, Bumped php client and mock client version
 (#877)

* Conflict resolved, Bumped php client and mock client version
---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 725d24ecc..37bd6d0b2 100644
--- a/composer.json
+++ b/composer.json
@@ -6,14 +6,14 @@
     "require": {
         "php": "~8.1",
         "ext-json": "*",
-        "apigee/apigee-client-php": "dev-drupal10-prep",
+        "apigee/apigee-client-php": "^3.0.0",
         "drupal/core": "^10.0",
         "drupal/entity": "^1.0",
         "drupal/key": "^1.8",
         "php-http/guzzle7-adapter": "^1.0"
     },
     "require-dev": {
-        "apigee/apigee-mock-client-php": "dev-drupal10-prep",
+        "apigee/apigee-mock-client-php": "^1.1.2",
         "drupal/drupal-extension": "^4.2.1 || ~5",
         "cweagans/composer-patches": "^1.6",
         "drupal/core-dev": "^10.0",