Merge branch 'feature/mvc-conflict'

Close #5
zendframework · May 31, 2016 · 0376361 · 0376361
2 parents 1343a40 + b82e532
commit 0376361
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.0.2 - TBD
+## 3.0.2 - 2016-05-31
 
 ### Added
 
@@ -18,7 +18,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#5](https://github.com/zendframework/zend-router/pull/5) marks zend-mvc
+  versions less than 3.0.0 as conflicts.
 
 ## 3.0.1 - 2016-04-18
 

diff --git a/composer.json b/composer.json
@@ -29,6 +29,9 @@
     "suggest": {
         "zendframework/zend-i18n": "^2.6, if defining translatable HTTP path segments"
     },
+    "conflict": {
+        "zendframework/zend-mvc": "<3.0.0"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "3.0-dev",