Resolve conflicts with panels.scss (no changes)

app/assets/stylesheets/framework/panels.scss

 .panel {
   margin-bottom: $gl-padding;
 }
-<<<<<<< HEAD
 
 .panel-slim {
   @extend .panel;
@@ -30,45 +29,8 @@
   &.split {
     display: flex;
     align-items: center;
-=======
-
-.panel-slim {
-  @extend .panel;
-  margin-bottom: $gl-vert-padding;
-}
-
-
-.panel-heading {
-  padding: $gl-vert-padding $gl-padding;
-  line-height: 36px;
-
-  .controls {
-    margin-top: -2px;
-    float: right;
-  }
-
-  .dropdown-menu-toggle {
-    line-height: 20px;
   }
 
-  .badge {
-    margin-top: -2px;
-    margin-left: 5px;
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
-  }
-
-  &.split {
-    display: flex;
-    align-items: center;
-  }
-
-<<<<<<< HEAD
-  .panel-body {
-    padding: $gl-padding;
-  }
-
-=======
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
   .left {
     flex: 1 1 auto;
   }
@@ -82,17 +44,10 @@
 .panel-empty-heading {
   border-bottom: 0;
 }
-<<<<<<< HEAD
-
-.panel-body {
-  padding: $gl-padding;
-
-=======
 
 .panel-body {
   padding: $gl-padding;
 
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
   .form-actions {
     margin: -$gl-padding;
     margin-top: $gl-padding;