fix: fix the conflect

pull/1987/head
luhaoling 2 years ago
commit 77abadde37

@ -18,6 +18,7 @@ import (
"bytes" "bytes"
"context" "context"
"errors" "errors"
"fmt"
"strings" "strings"
"time" "time"
@ -28,8 +29,6 @@ import (
"github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/log"
"github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/mcontext"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
"fmt"
) )
const maxRetry = 10 // number of retries const maxRetry = 10 // number of retries

Loading…
Cancel
Save