Skip to content

G
gitlab-ce
Commit 6f8406ae authored by Nick Thomas's avatar Nick Thomas
Browse files
Options

Fix SCSS conflicts

parent f4c5ce68
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/stylesheets/pages/issuable.scss
View file @ 6f8406ae
...@@ -659,12 +659,9 @@ ...@@ -659,12 +659,9 @@
@media(max-width: $screen-md-max) { @media(max-width: $screen-md-max) {
.task-status, .task-status,
.issuable-due-date, .issuable-due-date,
<<<<<<< HEAD
.project-ref-path, .project-ref-path,
.issuable-weight { .issuable-weight {
=======
.project-ref-path { .project-ref-path {
>>>>>>> ce/master
display: none; display: none;
} }
} }
......
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