Fix conflicts in empty state view & stylesheets

app/assets/stylesheets/framework/blank.scss

@@ -30,7 +30,6 @@
     margin-bottom: 0;
   }
 }
-<<<<<<< HEAD
 
 .blank-state-link {
   display: block;
@@ -38,15 +37,6 @@
   flex: 0 0 100%;
   margin-bottom: 15px;
 
-=======
-
-.blank-state-link {
-  display: block;
-  color: $gl-text-color;
-  flex: 0 0 100%;
-  margin-bottom: 15px;
-
->>>>>>> upstream/master
   @media (min-width: $screen-sm-min) {
     flex: 0 0 49%;
 
@@ -73,10 +63,7 @@
 
   @media (min-width: $screen-sm-min) {
     display: flex;
-<<<<<<< HEAD
     height: 100%;
-=======
->>>>>>> upstream/master
     align-items: center;
     padding: 50px 30px;
   }
@@ -102,7 +89,6 @@
     @media (min-width: $screen-sm-min) {
       padding-left: 20px;
     }
-<<<<<<< HEAD
   }
 }
 
@@ -132,7 +118,5 @@
 @media (max-width: $screen-xs-max) {
   .blank-state-icon svg {
     width: 315px;
-=======
->>>>>>> upstream/master
   }
 }

app/assets/stylesheets/framework/mixins.scss

@@ -181,41 +181,6 @@
   }
 }
 
-<<<<<<< HEAD
-@mixin fade($gradient-direction, $gradient-color) {
-  visibility: hidden;
-  opacity: 0;
-  z-index: 2;
-  position: absolute;
-  bottom: 12px;
-  width: 43px;
-  height: 30px;
-  transition-duration: .3s;
-  -webkit-transform: translateZ(0);
-  background: linear-gradient(to $gradient-direction, $gradient-color 45%, rgba($gradient-color, 0.4));
-
-  &.scrolling {
-    visibility: visible;
-    opacity: 1;
-    transition-duration: .3s;
-  }
-
-  .fa {
-    position: relative;
-    top: 5px;
-    font-size: 18px;
-  }
-}
-
-@mixin scrolling-links() {
-  overflow-x: auto;
-  overflow-y: hidden;
-  -webkit-overflow-scrolling: touch;
-  display: flex;
-
-  &::-webkit-scrollbar {
-    display: none;
-=======
 @mixin triangle($color, $border-color, $size, $border-size) {
   &::before,
   &::after {
@@ -241,6 +206,5 @@
     border-bottom-color: $color;
     border-width: $size;
     margin-left: -$size;
->>>>>>> upstream/master
   }
 }

app/views/dashboard/projects/_zero_authorized_projects.html.haml

-<<<<<<< HEAD
 - admin_without_ee_license = !current_license && current_user.admin?
 
 .blank-state-parent-container{ class: ('has-start-trial-container' if admin_without_ee_license) }
   .section-container.section-welcome{ class: ('col-md-6' if admin_without_ee_license) }
-=======
-.blank-state-parent-container
-  .section-container.section-welcome{ class: "#{ 'section-admin-welcome' if current_user.admin? }" }
->>>>>>> upstream/master
     .container.section-body
       .row
         .blank-state-welcome
@@ -14,7 +9,6 @@
             Welcome to GitLab
           %p.blank-state-text
             Code, test, and deploy together
-<<<<<<< HEAD
         .blank-state-row
           %div{ class: ('column-large' if admin_without_ee_license) }
             - if current_user.admin?
@@ -24,9 +18,3 @@
           - if admin_without_ee_license
             .column-small
               = render "blank_state_ee_trial"
-=======
-        - if current_user.admin?
-          = render "blank_state_admin_welcome"
-        - else
-          = render "blank_state_welcome"
->>>>>>> upstream/master