Merge branch 'hotfix/3.1.4'

nekofar · May 29, 2023 · 017a40e · 017a40e
2 parents 10c6ab7 + b78afdf
commit 017a40e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.1.4] - 2023-05-29
+
+### <!-- 02 -->Bug Fixes
+
+- Solve conflict with `slim-test` version `<=3.2.0`
+
 ## [3.1.3] - 2023-05-29
 
 ### <!-- 04 -->Refactor

diff --git a/composer.json b/composer.json
@@ -18,6 +18,9 @@
         "pestphp/pest": "^2.0",
         "pestphp/pest-plugin": "^2.0"
     },
+    "conflict": {
+        "nekofar/slim-test": "<=3.2.0"
+    },
     "require-dev": {
         "nekofar/dev-tools": "^3.1",
         "pestphp/pest-dev-tools": "^2.0",