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
d83a5665
Commit
d83a5665
authored
Mar 07, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ci skip] Resolve conflicts for app/assets/stylesheets/pages/groups.scss
parent
19d05695
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+2
-3
No files found.
app/assets/stylesheets/pages/groups.scss
View file @
d83a5665
...
...
@@ -86,7 +86,6 @@
}
}
<<<<<<<
HEAD
.panel
{
.shared_runners_limit_under_quota
{
color
:
$gl-success
;
...
...
@@ -121,7 +120,8 @@
table
.pipeline-project-metrics
tr
td
{
padding
:
$gl-padding
;
=======
}
.mattermost-icon
svg
{
width
:
16px
;
height
:
16px
;
...
...
@@ -136,5 +136,4 @@ table.pipeline-project-metrics tr td {
display
:
block
;
color
:
$gl-text-color-secondary
;
margin-top
:
10px
;
>>>>>>>
24f1ee5e9b1f4d9bc8cff581419b091756da8deb
}
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