diff options
| author | Valery Piashchynski <[email protected]> | 2020-12-20 19:53:27 +0300 |
|---|---|---|
| committer | Valery Piashchynski <[email protected]> | 2020-12-20 19:53:27 +0300 |
| commit | aafc330258e5ecd3277bb49eabfef667c960cfe3 (patch) | |
| tree | 3de1db26de82d87f1288d45d05da1eca53b735d6 /go.mod | |
| parent | c52e3fdff0c7e694c6bb2d484be1e4fd9cd1a3b8 (diff) | |
Resolve merge conflict
Diffstat (limited to 'go.mod')
| -rwxr-xr-x | go.mod | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -4,14 +4,12 @@ go 1.15 require ( github.com/NYTimes/gziphandler v1.1.1 - github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect github.com/fatih/color v1.10.0 - github.com/go-ole/go-ole v1.2.4 // indirect - github.com/gofiber/fiber/v2 v2.2.3 + github.com/gofiber/fiber/v2 v2.3.0 github.com/golang/mock v1.4.4 github.com/hashicorp/go-multierror v1.1.0 github.com/json-iterator/go v1.1.10 - github.com/prometheus/client_golang v1.8.0 + github.com/prometheus/client_golang v1.9.0 github.com/shirou/gopsutil v3.20.11+incompatible github.com/spf13/viper v1.7.1 github.com/spiral/endure v1.0.0-beta20 @@ -22,7 +20,7 @@ require ( github.com/yookoala/gofast v0.4.0 go.uber.org/multierr v1.6.0 go.uber.org/zap v1.16.0 - golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb - golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 - golang.org/x/sys v0.0.0-20201202213521-69691e467435 + golang.org/x/net v0.0.0-20201216054612-986b41b23924 + golang.org/x/sync v0.0.0-20201207232520-09787c993a3a + golang.org/x/sys v0.0.0-20201218084310-7d0127a74742 ) |