Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #26 from Laravel-Lang/2.x
Added `conflict` block to the `composer.json`
- Loading branch information