diff options
author | TorchedSammy <38820196+TorchedSammy@users.noreply.github.com> | 2022-04-24 16:00:34 -0400 |
---|---|---|
committer | TorchedSammy <38820196+TorchedSammy@users.noreply.github.com> | 2022-04-24 16:00:34 -0400 |
commit | b0cb097bbb01eef65ae2099844d682a105d91d88 (patch) | |
tree | 6f9cf377a37de4937198b6e3758fe0b34f45a37b /plugins/language_tsx.lua | |
parent | 7a408d013259e867a45af8cf561057c8c1635855 (diff) | |
parent | f2bd9349a5a286cf6c0612225336d7015f86cba0 (diff) | |
download | lite-xl-plugins-b0cb097bbb01eef65ae2099844d682a105d91d88.tar.gz lite-xl-plugins-b0cb097bbb01eef65ae2099844d682a105d91d88.zip |
docs: resolve merge conflict, bring in latest changes
Diffstat (limited to 'plugins/language_tsx.lua')
0 files changed, 0 insertions, 0 deletions