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 #22 from lloricode/patch-1
Add conflict to composer.json to prevent our package from being installed alongside the original
- Loading branch information