Fix conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/stylesheets/pages/pipelines.scss

@@ -490,11 +490,7 @@
     color: $gl-text-color-secondary;
 
     // Action Icons in big pipeline-graph nodes
-<<<<<<< HEAD
-    > div > .ci-action-icon-container .ci-action-icon-wrapper {
-=======
     .ci-action-icon-container .ci-action-icon-wrapper {
->>>>>>> origin/master
       height: 30px;
       width: 30px;
       background: $white-light;
@@ -519,11 +515,7 @@
       }
     }
 
-<<<<<<< HEAD
-    > div > .ci-action-icon-container {
-=======
     .ci-action-icon-container {
->>>>>>> origin/master
       position: absolute;
       right: 5px;
       top: 5px;
@@ -553,11 +545,7 @@
       }
     }
 
-<<<<<<< HEAD
-    > div > .build-content {
-=======
     .build-content {
->>>>>>> origin/master
       display: inline-block;
       padding: 8px 10px 9px;
       width: 100%;

app/serializers/build_entity.rb

@@ -31,12 +31,9 @@ class BuildEntity < Grape::Entity
 
   def detailed_status
     build.detailed_status(request.current_user)
-<<<<<<< HEAD
   end
 
   def path_to(route, build)
     send("#{route}_path", build.project.namespace, build.project, build)
-=======
->>>>>>> origin/master
   end
 end

db/schema.rb

@@ -11,11 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
 ActiveRecord::Schema.define(version: 20170508170547) do
-=======
-ActiveRecord::Schema.define(version: 20170505133904) do
->>>>>>> origin/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"