Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new language bindings #91

Merged
merged 30 commits into from
Dec 3, 2023
Merged

Add new language bindings #91

merged 30 commits into from
Dec 3, 2023

Conversation

dabico
Copy link
Member

@dabico dabico commented Dec 3, 2023

Combining multiple dependencies PRs into one.

Instructions for merging
  • Use a merge commit, so that GitHub will mark all original PRs as merged.
  • If your repository does not have merge commits enabled, please temporarily enable them in settings. Tick Allow merge commits in the repository settings.
  • When ready, merge this PR using Create a merge commit.

Combined PRs

# Conflicts:
#	.gitmodules
#	lib/ch_usi_si_seart_treesitter.h
#	lib/ch_usi_si_seart_treesitter_Language.cc
#	lib/ch_usi_si_seart_treesitter_Language.h
#	src/main/java/ch/usi/si/seart/treesitter/Language.java
# Conflicts:
#	src/main/java/ch/usi/si/seart/treesitter/Language.java
# Conflicts:
#	src/main/java/ch/usi/si/seart/treesitter/Language.java
# Conflicts:
#	.gitmodules
#	lib/ch_usi_si_seart_treesitter.h
#	lib/ch_usi_si_seart_treesitter_Language.cc
#	lib/ch_usi_si_seart_treesitter_Language.h
#	src/main/java/ch/usi/si/seart/treesitter/Language.java
# Conflicts:
#	src/main/java/ch/usi/si/seart/treesitter/Language.java
This is just to maintain the alphabetically sorted order of the file.
Does not impact the repository in any way.
@dabico dabico merged commit 50aca83 into master Dec 3, 2023
2 checks passed
@dabico dabico deleted the language/combined-prs branch December 3, 2023 19:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant