diff options
author | Sean E. Russell <ser@ser1.net> | 2020-11-23 14:58:32 -0600 |
---|---|---|
committer | Sean E. Russell <ser@ser1.net> | 2020-11-23 14:58:32 -0600 |
commit | daf5916fde35c7ae2a69fc45a32f9c684d88fe2b (patch) | |
tree | 2090650c190b4a517d6d1f4da8fde1cb3b2c2563 /go.mod | |
parent | 72cde0545887f98e58423c1495327276daa202b5 (diff) | |
parent | edf0c2a3a8edd43a685ef91c2e3f9f3ea7d5bc23 (diff) |
Resolves merge conflicts
Diffstat (limited to 'go.mod')
-rw-r--r-- | go.mod | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -4,9 +4,11 @@ require ( github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect github.com/VictoriaMetrics/metrics v1.11.2 github.com/VividCortex/ewma v1.1.1 + github.com/cloudfoundry-attic/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 github.com/distatus/battery v0.9.0 github.com/gizak/termui/v3 v3.1.0 github.com/go-ole/go-ole v1.2.4 // indirect + github.com/jdkeke142/lingo-toml v0.0.0-20200705162942-3520fe0dec06 github.com/mattn/go-runewidth v0.0.4 github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0 |