Fix conflict in app/assets/stylesheets/framework/panels.scss

64c946ea · Clement Ho · 7d21a109 · 64c946ea
Commit 64c946ea authored May 25, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

app/assets/stylesheets/framework/panels.scss app/assets/stylesheets/framework/panels.scss +0 -5

No files found.
--- a/app/assets/stylesheets/framework/panels.scss
+++ b/app/assets/stylesheets/framework/panels.scss
@@ -7,12 +7,7 @@
  margin-bottom: $gl-vert-padding;
 }

-
-<<<<<<< HEAD
-.card-heading {
-=======
 .card-header {
->>>>>>> gitlab-ce/master
  padding: $gl-vert-padding $gl-padding;
  line-height: 36px;