Resolved merge conflict.

2 years ago · 58883bca7c
parent e6d82ac482 e5ac3d9d5c
commit 58883bca7c
3 changed files with 9 additions and 4 deletions
--- a/README.md
+++ b/README.md
@ -107,6 +107,7 @@ For a presentation highlighting this package, compile and run the program found
 - [twad: a WAD launcher for the terminal](https://github.com/zmnpl/twad)
 - [pacseek: A TUI for searching and installing Arch Linux packages](https://github.com/moson-mo/pacseek)
 - [7GUIs demo](https://github.com/letientai299/7guis/tree/master/tui)
+- [tuihub: A utility hub/dashboard for personal use](https://github.com/ashis0013/tuihub)

 ## Documentation

--- a/go.mod
+++ b/go.mod
@ -1,12 +1,16 @@
 module github.com/rivo/tview

-go 1.12
+go 1.18

 require (
 	github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1
 	github.com/lucasb-eyer/go-colorful v1.2.0
 	github.com/mattn/go-runewidth v0.0.13
-	github.com/rivo/uniseg v0.3.1
+	github.com/rivo/uniseg v0.3.2
+)
+
+require (
+	github.com/gdamore/encoding v1.0.0 // indirect
 	golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect
 	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
 	golang.org/x/text v0.3.7 // indirect
--- a/go.sum
+++ b/go.sum
@ -7,8 +7,8 @@ github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i
 github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.3.1 h1:SDPP7SHNl1L7KrEFCSJslJ/DM9DT02Nq2C61XrfHMmk=
-github.com/rivo/uniseg v0.3.1/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rivo/uniseg v0.3.2 h1:LChASUgFg605VMaHSYtAQCVaqg+6ugUWj9Foyg9WC0c=
+github.com/rivo/uniseg v0.3.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY=
 golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=