Fixed conflicts related to rails 5

.gitlab-ci.yml

@@ -80,7 +80,6 @@ stages:
     - mysql:5.7
     - redis:alpine
 
-<<<<<<< HEAD
 # BEGIN EE-only service helpers
 
 .use-pg-9-6: &use-pg-9-6
@@ -107,8 +106,6 @@ stages:
 
 # END EE-only service helpers
 
-=======
->>>>>>> upstream/master
 .rails4: &rails4
   allow_failure: false
   except:

doc/development/README.md

@@ -53,10 +53,7 @@ description: 'Learn how to contribute to GitLab.'
 - [Prometheus metrics](prometheus_metrics.md)
 - [Guidelines for reusing abstractions](reusing_abstractions.md)
 - [DeclarativePolicy framework](policies.md)
-<<<<<<< HEAD
 - [Geo development](geo.md)
-=======
->>>>>>> upstream/master
 - [Switching to Rails 5](switching_to_rails5.md)
 
 ## Performance guides