From d5b873b70b04c776831349e6aac57f8bfaa8e553 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 15 Aug 2022 19:01:57 +0800 Subject: [PATCH] Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del # Conflicts: # pkg/common/db/mysql_model/im_mysql_model/ip_model.go --- internal/demo/register/ip_limit.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/demo/register/ip_limit.go b/internal/demo/register/ip_limit.go index afc4f01f9..c562f15ae 100644 --- 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"