Commit 618a7a7f authored by 刘丹's avatar 刘丹

冲突

parent 82dfbeb7
......@@ -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');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment