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 #87 from GabrielCC/patch-1
removed conflicting check
- Loading branch information