Merge branch 'hotfix/conflicts'

Close #8

Author: weierophinney

.travis.yml

@@ -25,15 +25,6 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 5.5
-      env:
-        - DEPS=lowest
-    - php: 5.5
-      env:
-        - DEPS=locked
-    - php: 5.5
-      env:
-        - DEPS=latest
     - php: 5.6
       env:
         - DEPS=lowest

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.1.10 - TBD
+## 1.1.10 - 2016-05-31
 
 ### Added
 
@@ -18,7 +18,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#8](https://github.com/zendframework/zend-mvc-console/pull/8) marks zend-mvc
+  versions less than 3.0.0 as conflicts.
 
 ## 1.1.9 - 2016-05-31
 

composer.json

@@ -9,7 +9,7 @@
     ],
     "homepage": "https://github.com/zendframework/zend-mvc-console",
     "require": {
-        "php": "^5.5 || ^7.0",
+        "php": "^5.6 || ^7.0",
         "container-interop/container-interop": "^1.1",
         "zendframework/zend-console": "^2.6",
         "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
@@ -30,6 +30,9 @@
     "suggest": {
         "zendframework/zend-filter": "^2.6.1, to filter rendered results"
     },
+    "conflict": {
+        "zendframework/zend-mvc": "<3.0.0"
+    },
     "autoload": {
         "psr-4": {
             "Zend\\Mvc\\Console\\": "src/"