Skip to content

G
gitlab-ce
Commit 621288ba authored by Clement Ho's avatar Clement Ho
Browse files
Options

Resolve conflict in bootstrap_migration.scss

parent 91651bb7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/stylesheets/bootstrap_migration.scss
View file @ 621288ba
...@@ -111,14 +111,11 @@ code { ...@@ -111,14 +111,11 @@ code {
background-color: inherit; background-color: inherit;
padding: unset; padding: unset;
} }
<<<<<<< HEAD
=======
.build-trace & { .build-trace & {
background-color: inherit; background-color: inherit;
padding: inherit; padding: inherit;
} }
>>>>>>> upstream/master
} }
.code { .code {
......
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