From ab303eb2560a0220cf235cee80f3a6d71f243ea9 Mon Sep 17 00:00:00 2001
From: dong_bo0602 <358256383@qq.com>
Date: Thu, 6 Aug 2020 16:56:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/app.js b/app.js
index 65f9b5f..f992a35 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
+  activityUrl: 'https://www.wgink.ink/culturalactivity',
+  volunteerUrl: 'https://www.wgink.ink/volunteer',
+  venueUrl: 'https://www.wgink.ink/venuebooking',
+  activityUrl: 'https://www.wgink.ink/culturalactivity',
+  volunteerUrl: 'https://www.wgink.ink/volunteer',
   liveUrl: 'https://www.wgink.ink/live',
   liveRecordUrl: 'https://www.wgink.ink',
   socialUrl: 'https://www.wgink.ink/social',