From 98883495edd3bcf70c156bb2931847b7ff4b4f83 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Thu, 6 Aug 2020 16:59:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=AA=8C=E8=AF=81=E7=A0=81=E5=80=92=E8=AE=A1=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app.js b/app.js
index 65f9b5f..e702dc3 100644
--- a/app.js
+++ b/app.js
@@ -7,15 +7,12 @@ App({
   newsUrl: 'https://www.wgink.ink/news',
   newsContentUrl: 'https://www.wgink.ink',
   libraryUrl: 'https://www.wgink.ink/library',
-<<<<<<< HEAD
   venueUrl: 'http://192.168.0.109:8082/venuebooking',
   activityUrl: 'http://192.168.0.111:8080/culturalactivity',
   volunteerUrl: 'https://www.wgink.ink/volunteer',
-=======
   venueUrl: 'https://www.wgink.ink/venuebooking',
   activityUrl: 'http://192.168.0.111:8080/culturalactivity',
   volunteerUrl: 'http://192.168.0.111:8888/volunteer',
->>>>>>> 8555f8c2cd310ce9fdc19a34346841205d404f1a
   liveUrl: 'https://www.wgink.ink/live',
   liveRecordUrl: 'https://www.wgink.ink',
   socialUrl: 'https://www.wgink.ink/social',