修复冲突

4 years ago · 9b93db8094
parent 0041ed08da
commit 9b93db8094
2 changed files with 1 additions and 5 deletions
--- a/internal/api/third/tencent_cloud_storage_credential.go
+++ b/internal/api/third/tencent_cloud_storage_credential.go
@ -6,14 +6,10 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-<<<<<<< HEAD
+
 =======
 	"github.com/fatih/structs"
 	//"github.com/fatih/structs"
 	"github.com/gin-gonic/gin"
 	sts "github.com/tencentyun/qcloud-cos-sts-sdk/go"
 >>>>>>> 17954df (Refactoring code)
 	"net/http"
 	"time"
--- a/script/build_all_service.sh
+++ b/script/build_all_service.sh