Skip to content

Commit e6452af

Browse files
got it
1 parent f4de888 commit e6452af

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

crates/pgt_treesitter_grammar/grammar.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ module.exports = grammar({
2727
[$.timestamp],
2828
[$.grantable_on_function, $.grantable_on_table],
2929
[$.any_identifier, $.column_identifier],
30-
<<<<<<< HEAD
3130
[$.any_identifier, $.schema_identifier, $.table_identifier],
3231
[$.schema_identifier, $.table_identifier],
3332
[$.table_reference, $.column_reference],
34-
=======
35-
>>>>>>> 79cd1c34953adb0a0e59e5d2dd0fd9b13a252c30
3633
],
3734

3835
precedences: ($) => [

0 commit comments

Comments
 (0)