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 #64 from tree-sitter/fixes
Conflict fixes
- Loading branch information
Conflict fixes