diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index da4798e..f5da6b3 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -561,12 +561,7 @@ Page({
 	onShareAppMessage: function () {
 		getApp().globalData.no_clear = 1;
         var url = "/pages/user/index/index";
-<<<<<<< HEAD
-
 		var userInfo = getApp().globalData.userInfo;
-=======
-        var userInfo = getApp().globalData.userInfo;
->>>>>>> dev_oa_lou1
         if (userInfo) {
             url += "?first_leader=" + getApp().globalData.user_id;
         }