Merge from remote branch

2022-02-23 01:00:27 +08:00
parent 3b2ec3d880 03e4b5d525
commit b192238699
79 changed files with 1071 additions and 542 deletions
--- a/rule/geosite.go
+++ b/rule/geosite.go
@ -5,10 +5,9 @@ import (

 	"github.com/Dreamacro/clash/component/geodata"
 	"github.com/Dreamacro/clash/component/geodata/router"
+	_ "github.com/Dreamacro/clash/component/geodata/standard"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
-
-	_ "github.com/Dreamacro/clash/component/geodata/standard"
 )

 type GEOSITE struct {