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
9a14ed50
Commit
9a14ed50
authored
May 08, 2018
by
Ash McKenzie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in app/views/admin/application_settings/show.html.haml
parent
9abf2680
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
6 deletions
+0
-6
app/views/admin/application_settings/show.html.haml
app/views/admin/application_settings/show.html.haml
+0
-6
No files found.
app/views/admin/application_settings/show.html.haml
View file @
9a14ed50
...
@@ -321,7 +321,6 @@
...
@@ -321,7 +321,6 @@
%button
.btn.js-settings-toggle
{
type:
'button'
}
%button
.btn.js-settings-toggle
{
type:
'button'
}
=
expanded
?
'Collapse'
:
'Expand'
=
expanded
?
'Collapse'
:
'Expand'
%p
%p
<
<<<<<<
HEAD
=
_
(
'Configure push and pull mirrors.'
)
=
_
(
'Configure push and pull mirrors.'
)
.settings-content
.settings-content
=
render
partial:
'repository_mirrors_form'
=
render
partial:
'repository_mirrors_form'
...
@@ -374,8 +373,3 @@
...
@@ -374,8 +373,3 @@
=
_
(
'Geo allows you to replicate your GitLab instance to other geographical locations.'
)
=
_
(
'Geo allows you to replicate your GitLab instance to other geographical locations.'
)
.settings-content
.settings-content
=
render
partial:
'slack'
=
render
partial:
'slack'
==
=====
=
_
(
'Configure push mirrors.'
)
.settings-content
=
render
partial:
'repository_mirrors_form'
>
>>>>>> upstream/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