diff options
author | Jan Hrastnik | 2021-06-16 15:05:14 +0000 |
---|---|---|
committer | Jan Hrastnik | 2021-06-16 15:05:14 +0000 |
commit | 5eb69183926ab2f781aa08abf587ba338027854b (patch) | |
tree | a2da3255e2d45f1db47abe05aa542d7c7a15bcd8 /runtime/queries/javascript/highlights-jsx.scm | |
parent | 17f69a03e0bd6c7bee7e26237dc47dfa0e0dd7c9 (diff) |
resolved conflict in rebase
Diffstat (limited to 'runtime/queries/javascript/highlights-jsx.scm')
0 files changed, 0 insertions, 0 deletions