Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
618a7a7f
Commit
618a7a7f
authored
Dec 29, 2017
by
刘丹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
冲突
parent
82dfbeb7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
15 deletions
+1
-15
Index.php
application/app/controller/Index.php
+1
-15
No files found.
application/app/controller/Index.php
View file @
618a7a7f
...
...
@@ -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'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment