Skip to content

Commit

Permalink
fix conflict section
Browse files Browse the repository at this point in the history
  • Loading branch information
FabienPapet committed Dec 12, 2019
1 parent bc7f06d commit acd1649
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"symfony/config": "<3.4 || >=4,<4.3",
"symfony/dependency-injection": "<3.4 || >=4,<4.3",
"symfony/http-kernel": "<3.4 || >=4,<4.3",
"twig/twig": ">=2,<2.12.1"
"twig/twig": "<2.12.1"
},
"require-dev": {
"laravel/framework": "~5.1",
Expand Down

0 comments on commit acd1649

Please sign in to comment.