Skip to content

G
gitlab-ce
Commit 33b71fa5 authored by Bob Van Landuyt's avatar Bob Van Landuyt
Browse files
Options

Resolve conflicts in `app/assets/stylesheets/pages/profile.scss`

parent 999e8c22
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/stylesheets/pages/profile.scss
View file @ 33b71fa5
...@@ -435,7 +435,6 @@ table.u2f-registrations { ...@@ -435,7 +435,6 @@ table.u2f-registrations {
} }
} }
} }
<<<<<<< HEAD
.gitlab-slack-gif { .gitlab-slack-gif {
width: 100%; width: 100%;
...@@ -474,5 +473,3 @@ table.u2f-registrations { ...@@ -474,5 +473,3 @@ table.u2f-registrations {
height: $double-headed-arrow-height; height: $double-headed-arrow-height;
} }
} }
=======
>>>>>>> upstream/master
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