Merge pull request #310 from mirko-pagliai/develop

added conflict package
mirko-pagliai · May 29, 2023 · 1baa527 · 1baa527
2 parents 062ce6b + 44bd697
commit 1baa527
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -44,6 +44,7 @@
         "psalm/phar": "^4.24"
     },
     "conflict": {
+        "components/jquery": "*",
         "newerton/fancy-box": "*",
         "studio-42/elfinder": "<= 2.1.58",
         "sunhater/kcfinder": "*",