Skip to content

Commit

Permalink
Fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Tetrergeru committed Dec 19, 2023
1 parent ee01f63 commit c7ba58d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ require (
github.com/google/go-cmp v0.5.9
github.com/gotokatsuya/ipare v0.0.0-20161202043954-fd52c5b6c44b
github.com/gregdel/pushover v1.1.0
github.com/karriereat/blackfriday-slack v0.1.0
github.com/moira-alert/go-chart v0.0.0-20231107064049-444c44a558ef
github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.13
github.com/patrickmn/go-cache v2.1.0+incompatible
Expand All @@ -51,6 +50,7 @@ require github.com/prometheus/common v0.37.0
require (
github.com/mattermost/mattermost/server/public v0.0.9
github.com/mitchellh/mapstructure v1.5.0
github.com/moira-alert/blackfriday-slack v0.1.2
github.com/swaggo/http-swagger v1.3.4
)

Expand Down Expand Up @@ -188,7 +188,6 @@ require (
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/mitchellh/reflectwalk v1.0.0 // indirect
github.com/moira-alert/blackfriday-slack v0.1.2 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/swaggo/files v1.0.1 // indirect
Expand Down
3 changes: 0 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,6 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
github.com/k0kubun/pp v2.3.0+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg=
github.com/karriereat/blackfriday-slack v0.1.0/go.mod h1:iM9iGxIpITGTuxl7benyJWiuXspkh5zLseXRKhTOu3M=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
Expand Down Expand Up @@ -904,8 +903,6 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/moira-alert/blackfriday-slack v0.1.2 h1:W6VbDlHDBxoB7X+OJ+3xZZuzMcQ0qTcblhLLnm/xQ7U=
github.com/moira-alert/blackfriday-slack v0.1.2/go.mod h1:tYMK3laTzU1wgxeOpUPdw36KHD3eTyQNDfxtg1nXLWI=
github.com/moira-alert/go-chart v0.0.0-20230220064910-812fb2829b9b h1:3eY3xHOj6Sh0f5Un6i9CFdqXNikLgPuGosg7+ZTpwbQ=
github.com/moira-alert/go-chart v0.0.0-20230220064910-812fb2829b9b/go.mod h1:Ezwok1WdoXI/W7cWe5leDLYf5WrA4nUFZWtKNT3tCs8=
github.com/moira-alert/go-chart v0.0.0-20231107064049-444c44a558ef h1:hSEQ/9B23MTYQCxx+GTRW5P1eWaqtgEMEqOxXs/YNKE=
github.com/moira-alert/go-chart v0.0.0-20231107064049-444c44a558ef/go.mod h1:ktrkvZGboMQfYyBXAV05imlVxGIvVdeCn5vz91Fw1vE=
github.com/msaf1980/go-stringutils v0.1.4 h1:UwsIT0hplHVucqbknk3CoNqKkmIuSHhsbBldXxyld5U=
Expand Down

0 comments on commit c7ba58d

Please sign in to comment.