fix composer merge conflict

cloudinary · Sep 26, 2023 · 6eab18d · 6eab18d
2 parents 762a793 + 98dc481
commit 6eab18d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -2,10 +2,10 @@
     "name": "cloudinary/cloudinary-magento2",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.19.7",
+    "version": "1.19.8",
     "license": "MIT",
     "require": {
-        "cloudinary/cloudinary_php": ">=2.7 <2.8.1",
+        "cloudinary/cloudinary_php": ">=2.7 <2.11.0",
         "php": ">=7.1 <8.3"
     },
     "autoload": {

diff --git a/etc/module.xml b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Cloudinary_Cloudinary" setup_version="1.19.7">
+  <module name="Cloudinary_Cloudinary" setup_version="1.19.8">
       <sequence>
           <module name="Magento_ProductVideo"/>
           <module name="Magento_PageBuilder"/>