chore: resolve merge conflicts

pull/59/head
sammyette 2021-05-24 07:26:30 -04:00
commit 207f6ba719
No known key found for this signature in database
GPG Key ID: 50EE40A2809851F5
1 changed files with 1 additions and 0 deletions

1
go.mod
View File

@ -9,6 +9,7 @@ require (
github.com/pborman/getopt v1.1.0
github.com/rivo/uniseg v0.2.0 // indirect
github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20210521203332-0cec03c779c1 // indirect
golang.org/x/term v0.0.0-20210503060354-a79de5458b56
layeh.com/gopher-luar v1.0.8