Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del

# Conflicts: # pkg/common/db/mysql_model/im_mysql_model/ip_model.go
3 years ago · d5b873b70b
parent 4ec255917d
commit d5b873b70b
1 changed files with 1 additions and 1 deletions
--- a/internal/demo/register/ip_limit.go
+++ b/internal/demo/register/ip_limit.go
@ -1,7 +1,7 @@
 package register
 import (
-	api "Open_IM/pkg/base_info"
+	//api "Open_IM/pkg/base_info"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
 	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"