Remove unnecessary conflicts
Not sure *why* I ended up with unnecessary conflicts, let's remove them now.

Not sure *why* I ended up with unnecessary conflicts, let's remove them now.
2025-03-13 19:58:23 +00:00 · 2024-12-23 12:04:25 -05:00 · 2022-06-04 11:02:13 +02:00 · 2022-11-22 10:57:06 +01:00 · 2022-06-13 10:03:58 +02:00 · 2025-03-13 19:58:23 +00:00
diff --git a/Bruno BELANYI b/Bruno BELANYI
Bruno BELANYI 4a77b2d7a0 All checks were successful ci/woodpecker/push/check Pipeline was successful Details Remove unnecessary conflicts Not sure why I ended up with unnecessary conflicts, let's remove them now.		2025-03-13 19:58:23 +00:00
.woodpecker	Add explicit 'pre-commit' CI step	2024-12-23 12:04:25 -05:00
bindings	Add queries to rust bindings	2022-06-04 11:02:13 +02:00
queries	Use 'parameter' high-light group	2022-11-22 10:57:06 +01:00
scripts	Add script for neovim tests	2022-06-13 10:03:58 +02:00
src	Remove unnecessary conflicts	2025-03-13 19:58:23 +00:00
test	Use 'parameter' high-light group	2022-11-22 10:57:06 +01:00
.clang-format	Add clang-format rules	2022-06-02 22:20:37 +02:00
.gitattributes	Add generated files attributes	2023-08-29 21:54:01 +01:00
.gitignore	Ignore rust-generated files	2022-11-22 10:25:29 +01:00
binding.gyp	Add scanner to bindings	2022-06-04 10:43:35 +02:00
Cargo.toml	Fix address of repository	2024-12-23 12:05:10 -05:00
flake.lock	Bump flake inputs	2022-11-22 10:24:47 +01:00
flake.nix	Simplify 'clang-format' pre-commit hook	2022-11-22 10:24:47 +01:00
grammar.js	Remove unnecessary conflicts	2025-03-13 19:58:23 +00:00
Makefile	Add Makefile	2022-11-22 10:26:00 +01:00
package.json	Capitalize language name	2024-12-23 12:06:46 -05:00
README.md	Add README	2022-06-04 22:04:10 +02:00