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
53f4664c
Commit
53f4664c
authored
Jun 01, 2018
by
Imre Farkas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflict in app/views/projects/issues/_nav_btns.html.haml
parent
7a760728
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
app/views/projects/issues/_nav_btns.html.haml
app/views/projects/issues/_nav_btns.html.haml
+0
-4
No files found.
app/views/projects/issues/_nav_btns.html.haml
View file @
53f4664c
<
<<<<<<
HEAD
-
show_rss_button
=
local_assigns
.
fetch
(
:show_rss_button
,
true
)
-
show_export_button
=
local_assigns
.
fetch
(
:show_export_button
,
true
)
...
...
@@ -10,9 +9,6 @@
-
if
show_export_button
=
render
'projects/issues/export_issues/button'
==
=====
=
render
'shared/issuable/feed_buttons'
>
>>>>>> upstream/master
-
if
@can_bulk_update
=
button_tag
"Edit issues"
,
class:
"btn btn-default append-right-10 js-bulk-update-toggle"
...
...
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