From 2720d8d8e2ea1a03e6dd42809d75f788349f66c8 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 12 May 2021 16:34:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/activity' into activity
---
pom.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5b99909..f1078c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,11 +224,11 @@
<version>${netty.version}</version>
</dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <version>${okhttp.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.squareup.okhttp3</groupId>-->
+ <!--<artifactId>okhttp</artifactId>-->
+ <!--<version>${okhttp.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>com.aliyun.oss</groupId>
--
Gitblit v1.9.1