Merge branch 'main' into feature/bots

This commit is contained in:
Jason Song
2023-01-09 14:08:06 +08:00
2 changed files with 3 additions and 4 deletions
+3 -3
View File
@@ -313,14 +313,14 @@ replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1
replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0
replace github.com/satori/go.uuid v1.2.0 => github.com/gofrs/uuid v4.2.0+incompatible
replace github.com/blevesearch/zapx/v15 v15.3.6 => github.com/zeripath/zapx/v15 v15.3.6-alignment-fix
replace github.com/nektos/act => gitea.com/gitea/act v0.234.0
exclude github.com/gofrs/uuid v3.2.0+incompatible
exclude github.com/gofrs/uuid v4.0.0+incompatible
exclude github.com/goccy/go-json v0.4.11
replace github.com/nektos/act => gitea.com/gitea/act v0.234.0
exclude github.com/satori/go.uuid v1.2.0