From b17630f88b9d3db1e42acda9a936de8fa536f6b5 Mon Sep 17 00:00:00 2001
From: myr1111 <3219004937@qq.com>
Date: Thu, 9 Jan 2020 10:15:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.luyuan.tk/asd/myrcar

---
 pages/index/index.wxml | 7 +++++++
 project.config.json    | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 0f794dc..b69c727 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 <!--index.wxml-->
 <view class="container">
     <view class="header"> 
@@ -19,9 +20,15 @@
 
 </view>
 =======
+=======
+>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
 <view>
   <view>
     <image src="../../utils/img/a.jpeg"></image>
   </view>
+<<<<<<< HEAD
+</view>
+>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
+=======
 </view>
 >>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
diff --git a/project.config.json b/project.config.json
index 023eb94..0b46df5 100644
--- a/project.config.json
+++ b/project.config.json
@@ -13,9 +13,14 @@
 		"coverView": true
 	},
 	"compileType": "miniprogram",
+<<<<<<< HEAD
 <<<<<<< HEAD
 	"libVersion": "2.0.4",
 	"appid": "wxae4f3cb3357e0b55",
+=======
+	"libVersion": "2.9.4",
+	"appid": "wx5766b7aac7c938b3",
+>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
 =======
 	"libVersion": "2.9.4",
 	"appid": "wx5766b7aac7c938b3",