Skip to content

Commit

Permalink
composer.json conflict with latte/latte >=2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
xificurk committed Aug 23, 2016
1 parent 3f8b4e9 commit 4a91c46
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@
"nette/utils": "^2.2@dev",
"texy/texy": "^2.8@dev"
},
"conflict": {
"latte/latte": ">=2.4"
},
"require-dev": {
"nette/tester": "^1.6",
"nette/bootstrap": "^2.3@dev",
"nette/di": "^2.3@dev",
"nette/application": "^2.3@dev",
"nette/application": "~2.3.0@dev",
"nette/http": "^2.3@dev",
"latte/latte": "^2.2@dev",
"tracy/tracy": "^2.3@dev",
Expand Down

0 comments on commit 4a91c46

Please sign in to comment.