Fix conflicts. Step 1

.gitlab-ci.yml

@@ -227,29 +227,6 @@ rake brakeman: *exec
 rake flay: *exec
 license_finder: *exec
 rake downtime_check: *exec
-<<<<<<< HEAD
-=======
-rake ee_compat_check:
-  <<: *exec
-  only:
-    - branches@gitlab-org/gitlab-ce
-  except:
-    - master
-    - tags
-    - /^[\d-]+-stable(-ee)?$/
-  allow_failure: yes
-  cache:
-    key: "ruby231-ee_compat_check_repo"
-    paths:
-      - ee_compat_check/repo/
-      - vendor/ruby
-  artifacts:
-    name: "${CI_BUILD_NAME}_${CI_BUILD_REF_NAME}_${CI_BUILD_REF}"
-    when: on_failure
-    expire_in: 10d
-    paths:
-      - ee_compat_check/patches/*.patch
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
 
 rake db:migrate:reset:
   stage: test

Gemfile.lock

@@ -766,14 +766,9 @@ GEM
       get_process_mem (~> 0)
       unicorn (>= 4, < 6)
     uniform_notifier (1.10.0)
-<<<<<<< HEAD
-    uuid (2.3.8)
-      macaddr (~> 1.0)
     validates_hostname (1.0.5)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
-=======
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
     version_sorter (2.1.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
@@ -875,12 +870,8 @@ DEPENDENCIES
   gollum-rugged_adapter (~> 0.4.2)
   gon (~> 6.1.0)
   grape (~> 0.15.0)
-<<<<<<< HEAD
-  grape-entity (~> 0.4.2)
   gssapi
-=======
   grape-entity (~> 0.6.0)
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
   haml_lint (~> 0.18.2)
   hamlit (~> 2.6.1)
   health_check (~> 2.2.0)

app/assets/stylesheets/pages/issuable.scss

@@ -258,14 +258,7 @@
 
         &:hover {
           background: transparent;
-<<<<<<< HEAD
-        }
-
-        i {
-          color: $sidebar-collapsed-icon-color;
-=======
           color: $gl-gray;
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
         }
       }
     }

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: 20161128170531) do
-=======
-ActiveRecord::Schema.define(version: 20161128161412) do
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"