Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
43214fd0
Commit
43214fd0
authored
Jun 30, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a merge conflict in app/views/projects/merge_requests/index.html.haml
parent
c57898aa
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
app/views/projects/merge_requests/index.html.haml
app/views/projects/merge_requests/index.html.haml
+1
-4
No files found.
app/views/projects/merge_requests/index.html.haml
View file @
43214fd0
...
...
@@ -35,8 +35,5 @@
.merge-requests-holder
=
render
'merge_requests'
-
else
<
<<<<<<
HEAD
=
render
'shared/empty_states/merge_requests'
,
button_path:
namespace_project_new_merge_request_path
(
@project
.
namespace
,
@project
)
==
=====
=
render
'shared/empty_states/merge_requests'
,
button_path:
new_merge_request_path
>
>>>>>> ce/master
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