diff options
| author | Nathan Vegdahl | 2021-06-20 23:09:14 +0000 |
|---|---|---|
| committer | Nathan Vegdahl | 2021-06-20 23:09:14 +0000 |
| commit | e686c3e4626fdafbcc2dab9d381eba83a5f6f974 (patch) | |
| tree | a598e3fedc1f2ae78ebc6f132c81b37cedf5415d /helix-syntax | |
| parent | 4efd6713c5b30b33c497a1f85b77a7b0a7fd17e0 (diff) | |
| parent | 985625763addd839a101263ae90cfb2f205830fc (diff) | |
Merge branch 'master' of github.com:helix-editor/helix into line_ending_detection
Rebasing was making me manually fix conflicts on every commit, so
merging instead.
Diffstat (limited to 'helix-syntax')
0 files changed, 0 insertions, 0 deletions