Skip to content

G
gitlab-ce
Commit 983d0b2f authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in app/assets/stylesheets/pages/issues.scss 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 5a8e8382
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/assets/stylesheets/pages/issues.scss
View file @ 983d0b2f
...@@ -149,7 +149,6 @@ ul.related-merge-requests > li { ...@@ -149,7 +149,6 @@ ul.related-merge-requests > li {
} }
} }
<<<<<<< HEAD
.issues-footer { .issues-footer {
padding-top: $gl-padding; padding-top: $gl-padding;
padding-bottom: 37px; padding-bottom: 37px;
...@@ -170,10 +169,7 @@ ul.related-merge-requests > li { ...@@ -170,10 +169,7 @@ ul.related-merge-requests > li {
} }
} }
.issue-email-modal-btn {
=======
.issuable-email-modal-btn { .issuable-email-modal-btn {
>>>>>>> upstream/master
padding: 0; padding: 0;
color: $gl-link-color; color: $gl-link-color;
background-color: transparent; background-color: transparent;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7