From d4f5915a7a4478679987bdc52514bbbefe4d8c2a Mon Sep 17 00:00:00 2001
From: weizhihong <weizhihong@joylink.club>
Date: Wed, 26 Jul 2023 18:00:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/config.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/config.go b/config/config.go
index bdef266..1c86472 100644
--- a/config/config.go
+++ b/config/config.go
@@ -32,7 +32,7 @@ type log struct {
 	Compress       bool   // 是否压缩日志
 	Stdout         bool   // 是否输出到控制台
 }
-<<<<<<< HEAD
+
 type messaging struct {
 	Centrifugo centrifugo
 }
@@ -41,11 +41,10 @@ type centrifugo struct {
 	ApiKey      string
 	ApiEndpoint string
 	Address     string
-=======
+}
 type dynamics struct {
 	UdpLocalPort  int
 	UdpRemoteAddr string
->>>>>>> a435ec7520b6fab654c7e0b9ece87920ee534ba9
 }
 
 var Config AppConfig