Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/conflicts'
Browse files Browse the repository at this point in the history
Close #8
  • Loading branch information
weierophinney committed May 31, 2016
2 parents 07bc968 + e43c222 commit 34f6ffd
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
9 changes: 0 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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/"
Expand Down

0 comments on commit 34f6ffd

Please sign in to comment.