冲突

application/app/controller/Index.php

@@ -35,14 +35,10 @@ class Index
 
     public function share_register()
     {
-<<<<<<< Updated upstream
-        return view('index/share_register');
-    }
 
-=======
       return view('index/share_register');
     }
->>>>>>> Stashed changes
+
     public function agent_detail()
     {
         return view('index/agent_detail');
@@ -50,7 +46,6 @@ class Index
 
     public function agreement()
     {
-<<<<<<< Updated upstream
         return view('index/agreement');
     }
 
@@ -58,19 +53,10 @@ class Index
     {
         return view('index/agreement_app');
     }
-
-=======
-      return view('index/agreement');
-    }
-    public function agreement_app()
-    {
-      return view('index/agreement_app');
-    }
     public function download()
     {
       return view('index/download');
     }
->>>>>>> Stashed changes
     public function more_pingjia()
     {
         return view('index/more_pingjia');